[tinker] unify AGP version to 3.2.1

Author: tys282000

build.gradle

@@ -2,10 +2,11 @@
 buildscript {
     repositories {
         mavenLocal()
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
     }
@@ -14,6 +15,7 @@ buildscript {
 allprojects {
     repositories {
         mavenLocal()
+        google()
         jcenter()
     }
 
@@ -27,8 +29,8 @@ ext {
     minSdkVersion = 10
     compileSdkVersion = 26
     targetSdkVersion = 23
-    buildToolsVersion = '26.0.2'
-    supportLibVersion = '25.1.0'
+    buildToolsVersion = '28.0.3'
+    supportLibVersion = '28.0.0'
     javaVersion = JavaVersion.VERSION_1_7
 
     GROUP = 'com.tencent.tinker'

third-party/aosp-dexutils/build.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
 

third-party/bsdiff-util/build.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
 

third-party/tinker-ziputils/build.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
 

tinker-android/tinker-android-anno/build.gradle

@@ -1,12 +1,12 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 version rootProject.ext.VERSION_NAME
 group rootProject.ext.GROUP
 
 [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
 sourceSets {

tinker-android/tinker-android-lib/build.gradle

@@ -14,10 +14,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile project(':tinker-commons')
-    compile project(':tinker-android:tinker-android-loader')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    implementation "com.android.support:support-annotations:${rootProject.ext.supportLibVersion}"
+    implementation project(':tinker-android:tinker-android-loader')
+    api project(':tinker-commons')
 }
 
 task buildTinkerSdk(type: Copy, dependsOn: [build]) {

tinker-android/tinker-android-loader/build.gradle

@@ -19,9 +19,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile "com.android.support:support-annotations:${rootProject.ext.supportLibVersion}"
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    implementation "com.android.support:support-annotations:${rootProject.ext.supportLibVersion}"
 }
 
 task buildTinkerSdk(type: Copy, dependsOn: [build]) {

tinker-build/tinker-patch-cli/build.gradle

@@ -1,13 +1,13 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 version rootProject.ext.VERSION_NAME
 group rootProject.ext.GROUP
 
 [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':tinker-build:tinker-patch-lib')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':tinker-build:tinker-patch-lib')
 }
 
 jar {

tinker-build/tinker-patch-gradle-plugin/build.gradle

@@ -5,12 +5,12 @@ version rootProject.ext.VERSION_NAME
 group rootProject.ext.GROUP
 
 dependencies {
-    compile gradleApi()
-    compile localGroovy()
-//    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':tinker-build:tinker-patch-lib')
-    compile 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
-    compile 'com.android.tools.build:gradle:2.1.0'
+    implementation gradleApi()
+    implementation localGroovy()
+//    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':tinker-build:tinker-patch-lib')
+    implementation 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
+    implementation 'com.android.tools.build:gradle:3.2.1'
 }
 
 repositories {

tinker-build/tinker-patch-lib/build.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 version rootProject.ext.VERSION_NAME
 group rootProject.ext.GROUP
@@ -7,14 +7,13 @@ group rootProject.ext.GROUP
 
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':tinker-commons')
-    compile group: 'com.tencent.mm', name: 'apk-parser-lib', version: '1.2.3'
-    compile group: 'com.google.guava', name: 'guava', version: '11.0.2'
-    compile group: 'org.ow2.asm', name: 'asm', version: '5.0.3'
-    compile group: 'org.smali', name: 'dexlib2', version: '2.1.3'
-
-    compile (group: 'dom4j', name: 'dom4j', version: '1.6.1')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    api project(':tinker-commons')
+    api group: 'com.tencent.mm', name: 'apk-parser-lib', version: '1.2.3'
+    implementation group: 'com.google.guava', name: 'guava', version: '11.0.2'
+    implementation group: 'org.ow2.asm', name: 'asm', version: '5.0.3'
+    implementation group: 'org.smali', name: 'dexlib2', version: '2.1.3'
+    implementation group: 'dom4j', name: 'dom4j', version: '1.6.1'
 }
 
 sourceSets {

tinker-commons/build.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 version rootProject.ext.VERSION_NAME
 group rootProject.ext.GROUP
@@ -7,10 +7,10 @@ group rootProject.ext.GROUP
 
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':third-party:aosp-dexutils')
-    compile project(':third-party:bsdiff-util')
-    compile project(':third-party:tinker-ziputils')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    api project(':third-party:aosp-dexutils')
+    api project(':third-party:bsdiff-util')
+    api project(':third-party:tinker-ziputils')
 }
 
 task buildTinkerSdk(type: Copy, dependsOn: [build]) {

tinker-sample-android/app/build.gradle

@@ -5,7 +5,11 @@ dependencies {
         implementation fileTree(dir: 'libs', include: ['*.jar'])
         testImplementation 'junit:junit:4.12'
         implementation "com.android.support:appcompat-v7:23.1.1"
-        implementation("com.tencent.tinker:tinker-android-lib:${TINKER_VERSION}") { changing = true }
+        api("com.tencent.tinker:tinker-android-lib:${TINKER_VERSION}") { changing = true }
+
+        // Maven local cannot handle transist dependencies.
+        implementation("com.tencent.tinker:tinker-android-loader:${TINKER_VERSION}") { changing = true }
+
         annotationProcessor("com.tencent.tinker:tinker-android-anno:${TINKER_VERSION}") { changing = true }
         compileOnly("com.tencent.tinker:tinker-android-anno:${TINKER_VERSION}") { changing = true }
 

tinker-sample-android/build.gradle

@@ -2,12 +2,15 @@
 buildscript {
     repositories {
         mavenLocal()
-        google()
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
         if (project.hasProperty('GRADLE_3') && GRADLE_3.equalsIgnoreCase('TRUE')) {
-            classpath 'com.android.tools.build:gradle:3.2.0-alpha02'
+            classpath 'com.android.tools.build:gradle:3.2.1'
         } else {
             classpath 'com.android.tools.build:gradle:2.3.3'
         }
@@ -25,8 +28,11 @@ buildscript {
 allprojects {
     repositories {
         mavenLocal()
-        google()
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }