Fix issue #4: WARNING: API 'variant.getJavaCompiler()' is obsolete and has...

Fix issue #4: WARNING: API 'variant.getJavaCompiler()' is obsolete and has been replaced with 'variant.getJavaCompileProvider()'

booster-android-gradle-api/build.gradle

@@ -4,6 +4,7 @@ dependencies {
     compile project(':booster-android-gradle-v3_0')
     compile project(':booster-android-gradle-v3_2')
     compile project(':booster-android-gradle-v3_3')
-    compileOnly 'com.android.tools.build:gradle:3.0.0'
-    testCompileOnly 'com.android.tools.build:gradle:3.0.0'
+    compile project(':booster-kotlinx')
+    compileOnly 'com.android.tools.build:gradle:3.3.0'
+    testCompileOnly 'com.android.tools.build:gradle:3.3.0'
 }

booster-gradle-base/src/main/kotlin/com/didiglobal/booster/gradle/BaseVariant.kt → booster-android-gradle-api/src/main/kotlin/com/didiglobal/booster/gradle/BaseVariant.kt

@@ -4,6 +4,7 @@ import com.android.build.gradle.api.BaseVariant
 import com.android.build.gradle.internal.api.InstallableVariantImpl
 import com.android.build.gradle.internal.scope.VariantScope
 import com.android.build.gradle.internal.variant.BaseVariantData
+import org.gradle.api.Task
 
 /**
  * The variant dependencies
@@ -28,3 +29,13 @@ val BaseVariant.scope: VariantScope
  */
 val BaseVariant.variantData: BaseVariantData
     get() = if (this is InstallableVariantImpl) this.variantData else javaClass.getDeclaredMethod("getVariantData").invoke(this) as BaseVariantData
+
+val BaseVariant.javaCompilerTask: Task
+    get() = if (GTE_V33) {
+        println(ANDROID_GRADLE_PLUGIN_VERSION)
+        this.javaCompileProvider.get()
+    } else {
+        println(ANDROID_GRADLE_PLUGIN_VERSION)
+        @Suppress("DEPRECATION")
+        this.javaCompiler
+    }

booster-gradle-base/src/main/kotlin/com/didiglobal/booster/gradle/Project.kt → booster-android-gradle-api/src/main/kotlin/com/didiglobal/booster/gradle/Project.kt

 package com.didiglobal.booster.gradle
 
 import com.android.build.gradle.BaseExtension
+import com.android.repository.Revision
 import org.gradle.api.Project
 
 /**
@@ -11,3 +12,11 @@ import org.gradle.api.Project
 inline fun <reified T : BaseExtension> Project.getAndroid(): T {
     return extensions.getByName("android") as T
 }
+
+/**
+ * The gradle version
+ */
+val Project.gradleVersion: Revision
+    get() {
+        return Revision.parseRevision(gradle.gradleVersion)
+    }

booster-android-gradle-api/src/main/kotlin/com/didiglobal/booster/gradle/VariantScope.kt

@@ -5,11 +5,6 @@ import com.android.builder.model.Version
 import com.android.repository.Revision
 import java.io.File
 
-private val ANDROID_GRADLE_PLUGIN_VERSION = Revision.parseRevision(Version.ANDROID_GRADLE_PLUGIN_VERSION)
-private val GTE_V3X = ANDROID_GRADLE_PLUGIN_VERSION.major >= 3
-private val GTE_V33 = GTE_V3X && ANDROID_GRADLE_PLUGIN_VERSION.minor >= 3
-private val GTE_V32 = GTE_V3X && ANDROID_GRADLE_PLUGIN_VERSION.minor >= 2
-
 private val ALL_ARTIFACTS_GETTER =
         when {
             GTE_V33 -> VariantScopeV33::getAllArtifacts

booster-android-gradle-api/src/main/kotlin/com/didiglobal/booster/gradle/Version.kt

+package com.didiglobal.booster.gradle
+
+import com.android.builder.model.Version
+import com.android.repository.Revision
+
+internal val ANDROID_GRADLE_PLUGIN_VERSION = Revision.parseRevision(Version.ANDROID_GRADLE_PLUGIN_VERSION)
+
+internal val GTE_V3X = ANDROID_GRADLE_PLUGIN_VERSION.major >= 3
+internal val GTE_V33 = GTE_V3X && ANDROID_GRADLE_PLUGIN_VERSION.minor >= 3
+internal val GTE_V32 = GTE_V3X && ANDROID_GRADLE_PLUGIN_VERSION.minor >= 2

booster-gradle-base/build.gradle

@@ -3,7 +3,6 @@ apply from: '../gradle/booster.gradle'
 dependencies {
     compile gradleApi()
     compile project(':booster-kotlinx')
-    compile project(':booster-android-gradle-api')
     compile 'com.google.auto.service:auto-service:1.0-rc4'
     compileOnly 'com.android.tools.build:gradle:3.0.0'
     testCompileOnly 'com.android.tools.build:gradle:3.0.0'

booster-gradle-plugin/build.gradle

@@ -2,7 +2,7 @@ apply from: '../gradle/booster.gradle'
 
 dependencies {
     kapt 'com.google.auto.service:auto-service:1.0-rc4'
-    compile project(':booster-gradle-base')
+    compile project(':booster-android-gradle-api')
     compile project(':booster-task-spi')
     compile project(':booster-transform-spi')
     compile project(':booster-transform-util')

booster-task-artifact/build.gradle

@@ -2,8 +2,9 @@ apply from: '../gradle/booster.gradle'
 
 dependencies {
     kapt "com.google.auto.service:auto-service:1.0-rc4"
-    implementation project(':booster-gradle-base')
-    implementation project(':booster-task-spi')
+    compile 'com.google.auto.service:auto-service:1.0-rc4'
+    compile project(':booster-android-gradle-api')
+    compile project(':booster-task-spi')
     compileOnly 'com.android.tools.build:gradle:3.0.0'
     testCompileOnly 'com.android.tools.build:gradle:3.0.0'
 }

booster-task-dependency/build.gradle

@@ -2,8 +2,9 @@ apply from: '../gradle/booster.gradle'
 
 dependencies {
     kapt "com.google.auto.service:auto-service:1.0-rc4"
-    implementation project(':booster-gradle-base')
-    implementation project(':booster-task-spi')
-    compileOnly 'com.android.tools.build:gradle:3.0.0'
-    testCompileOnly 'com.android.tools.build:gradle:3.0.0'
+    compile 'com.google.auto.service:auto-service:1.0-rc4'
+    compile project(':booster-android-gradle-api')
+    compile project(':booster-task-spi')
+    compileOnly 'com.android.tools.build:gradle:3.3.0'
+    testCompileOnly 'com.android.tools.build:gradle:3.3.0'
 }

booster-task-dependency/src/main/kotlin/com/didiglobal/booster/task/dependency/DependencyVariantProcessor.kt

 package com.didiglobal.booster.task.dependency
 
 import com.android.build.gradle.api.BaseVariant
+import com.didiglobal.booster.gradle.javaCompilerTask
 import com.didiglobal.booster.gradle.scope
 import com.didiglobal.booster.task.spi.VariantProcessor
 import com.google.auto.service.AutoService
@@ -15,7 +16,7 @@ class DependencyVariantProcessor : VariantProcessor {
             it.variant = variant
             it.outputs.upToDateWhen { false }
         }.also {
-            variant.javaCompiler.dependsOn(it)
+            variant.javaCompilerTask.dependsOn(it)
             checkSnapshot.dependsOn(it)
         }
     }

booster-task-permission/build.gradle

@@ -2,8 +2,9 @@ apply from: '../gradle/booster.gradle'
 
 dependencies {
     kapt "com.google.auto.service:auto-service:1.0-rc4"
-    implementation project(':booster-gradle-base')
-    implementation project(':booster-task-spi')
-    compileOnly 'com.android.tools.build:gradle:3.0.0'
-    testCompileOnly 'com.android.tools.build:gradle:3.0.0'
+    compile 'com.google.auto.service:auto-service:1.0-rc4'
+    compile project(':booster-android-gradle-api')
+    compile project(':booster-task-spi')
+    compileOnly 'com.android.tools.build:gradle:3.3.0'
+    testCompileOnly 'com.android.tools.build:gradle:3.3.0'
 }

booster-transform-bugfix-toast/build.gradle

@@ -2,6 +2,7 @@ apply from: '../gradle/booster.gradle'
 
 dependencies {
     kapt "com.google.auto.service:auto-service:1.0-rc4"
+    implementation project(':booster-android-gradle-api')
     implementation project(':booster-gradle-base')
     implementation project(':booster-task-spi')
     implementation project(':booster-transform-asm')

gradle/wrapper/gradle-wrapper.properties

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists