From debd5c0a94c4201f57bd4708f60e8496c2d44143 Mon Sep 17 00:00:00 2001
From: caiqikao <caiqikao@126.com>
Date: Tue, 18 Dec 2018 17:44:48 +0800
Subject: [PATCH] =?UTF-8?q?1.TagView=20=E6=94=AF=E6=8C=81=20API28=202.?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9C=AC=E5=9C=B0maven?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androidtagview/build.gradle                   |  9 +++++-
 androidtagview/maven.gradle                   | 30 +++++++++++++++++++
 androidtagview/mkuploadArchives.sh            |  2 ++
 .../java/co/lujun/androidtagview/TagView.java |  8 ++++-
 gradle.properties                             | 14 +++++++++
 5 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 androidtagview/maven.gradle
 create mode 100755 androidtagview/mkuploadArchives.sh

diff --git a/androidtagview/build.gradle b/androidtagview/build.gradle
index 343a70d..f565743 100644
--- a/androidtagview/build.gradle
+++ b/androidtagview/build.gradle
@@ -16,6 +16,12 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    //解决build aar 异常问题
+    lintOptions {
+        abortOnError false
+    }
+
 }
 
 dependencies {
@@ -23,4 +29,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.3.1'
 }
-apply from: 'https://raw.githubusercontent.com/whilu/AndroidPublishLibrary/master/project/library/bintray_publish.gradle'
\ No newline at end of file
+apply from: "maven.gradle" //maven 仓库配置引入
+//apply from: 'https://raw.githubusercontent.com/whilu/AndroidPublishLibrary/master/project/library/bintray_publish.gradle'
\ No newline at end of file
diff --git a/androidtagview/maven.gradle b/androidtagview/maven.gradle
new file mode 100644
index 0000000..bc22f9b
--- /dev/null
+++ b/androidtagview/maven.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'maven'
+
+//配置maven build
+uploadArchives {
+    repositories.mavenDeployer {
+        name = 'mavenCentralReleaseDeployer'
+        pom {
+            version = maven_pom_version
+            artifactId = maven_pom_artifact_id
+            groupId = maven_pom_group_id
+            packaging = maven_pom_packaging
+            name = maven_pom_name
+            description = maven_pom_description
+        }
+        repository(url: maven_url + pom.groupId) {
+            authentication(userName: maven_user_name, password: maven_password)
+        }
+
+    }
+}
+
+//aar 打包支持源码查看
+task sourcesJar(type: Jar) {
+    classifier = 'sources'
+    from android.sourceSets.main.java.srcDirs
+}
+
+artifacts {
+    archives sourcesJar
+}
diff --git a/androidtagview/mkuploadArchives.sh b/androidtagview/mkuploadArchives.sh
new file mode 100755
index 0000000..63db60d
--- /dev/null
+++ b/androidtagview/mkuploadArchives.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew -p network clean build uploadArchives
\ No newline at end of file
diff --git a/androidtagview/src/main/java/co/lujun/androidtagview/TagView.java b/androidtagview/src/main/java/co/lujun/androidtagview/TagView.java
index be878d0..d2cf231 100644
--- a/androidtagview/src/main/java/co/lujun/androidtagview/TagView.java
+++ b/androidtagview/src/main/java/co/lujun/androidtagview/TagView.java
@@ -399,7 +399,13 @@ private void drawRipple(Canvas canvas){
                 canvas.clipPath(mPath);
                 mPath.addRoundRect(mRectF, mBorderRadius, mBorderRadius, Path.Direction.CCW);
 
-                canvas.clipPath(mPath, Region.Op.REPLACE);
+                //bug: https://github.com/whilu/AndroidTagView/issues/88
+                //Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+                if (Build.VERSION.SDK_INT >= 26) {
+                    canvas.clipPath(mPath);
+                } else {
+                    canvas.clipPath(mPath, Region.Op.REPLACE);
+                }
                 canvas.drawCircle(mTouchX, mTouchY, mRippleRadius, mRipplePaint);
                 canvas.restore();
             }catch (UnsupportedOperationException e){
diff --git a/gradle.properties b/gradle.properties
index 629cc7b..ca5ae82 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,3 +13,17 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Sun Jan 24 18:50:31 CST 2016
+#module  maven.gradle  config
+#maven_url        =http://nexus.caiqikao.com:8081/repository/
+maven_url        =http://localhost:8081/repository/
+maven_group_name =cn.clark
+#maven_user_name  =admin
+#maven_password   =clark1122
+maven_user_name  =admin
+maven_password   =admin123
+maven_pom_version    =1.0.0
+maven_pom_artifact_id=tagview
+maven_pom_group_id   =cn.clark90.fork
+maven_pom_packaging  =aar
+maven_pom_name       =标签组
+maven_pom_description=标签组