Update Hilt Plugin to AGP beta04 and use renamed APIs when configurin…

…g the ASM transform. Fixes #2337 RELNOTES=Fix an incompatibility issue between the Hilt Gradle Plugin and AGP 4.2.0-beta04. Note that this fix makes it so that earlier versions of AGP 4.2.0 are incompatible with Hilt's Plugin. PiperOrigin-RevId: 354610640
google · Jan 29, 2021 · 9da5114 · 9da5114
1 parent c8713e5
commit 9da5114
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        agp: ['4.1.0', '4.2.0-beta01']
+        agp: ['4.1.0', '4.2.0-beta04']
     steps:
       - name: 'Check out repository'
         uses: actions/checkout@v2

diff --git a/java/dagger/hilt/android/example/gradle/simple/build.gradle b/java/dagger/hilt/android/example/gradle/simple/build.gradle
@@ -17,7 +17,7 @@
 buildscript {
     ext {
         kotlin_version = '1.3.61'
-        agp_version = "4.2.0-beta01"
+        agp_version = "4.2.0-beta04"
     }
     repositories {
         google()

diff --git a/java/dagger/hilt/android/example/gradle/simpleKotlin/build.gradle b/java/dagger/hilt/android/example/gradle/simpleKotlin/build.gradle
@@ -17,7 +17,7 @@
 buildscript {
     ext {
         kotlin_version = '1.3.61'
-        agp_version = "4.2.0-beta01"
+        agp_version = "4.2.0-beta04"
     }
     repositories {
         google()

diff --git a/java/dagger/hilt/android/plugin/build.gradle b/java/dagger/hilt/android/plugin/build.gradle
@@ -42,7 +42,7 @@ configurations {
 
 dependencies {
   implementation gradleApi()
-  compileOnly 'com.android.tools.build:gradle:4.2.0-beta01'
+  compileOnly 'com.android.tools.build:gradle:4.2.0-beta04'
   // TODO(danysantiago): Make compileOnly to avoid dep for non-Kotlin projects.
   implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.20'
   implementation 'org.javassist:javassist:3.26.0-GA'
@@ -51,7 +51,7 @@ dependencies {
   testImplementation gradleTestKit()
   testImplementation 'junit:junit:4.12'
   testImplementation 'com.google.truth:truth:1.0.1'
-  additionalTestPlugin 'com.android.tools.build:gradle:4.2.0-beta01'
+  additionalTestPlugin 'com.android.tools.build:gradle:4.2.0-beta04'
 }
 
 // Configure the generating task of plugin-under-test-metadata.properties to

diff --git a/...dagger/hilt/android/plugin/src/main/kotlin/dagger/hilt/android/plugin/HiltGradlePlugin.kt b/...dagger/hilt/android/plugin/src/main/kotlin/dagger/hilt/android/plugin/HiltGradlePlugin.kt
@@ -221,8 +221,8 @@ class HiltGradlePlugin : Plugin<Project> {
 
     val androidComponents = project.extensions.getByType(AndroidComponentsExtension::class.java)
     androidComponents.onVariants { registerTransform(it) }
-    androidComponents.androidTest { registerTransform(it) }
-    androidComponents.unitTest { registerTransform(it) }
+    androidComponents.androidTests { registerTransform(it) }
+    androidComponents.unitTests { registerTransform(it) }
   }
 
   private fun configureTransform(project: Project, hiltExtension: HiltExtension) {

diff --git a/java/dagger/hilt/android/plugin/src/test/kotlin/GradleTestRunner.kt b/java/dagger/hilt/android/plugin/src/test/kotlin/GradleTestRunner.kt
@@ -107,7 +107,7 @@ class GradleTestRunner(val tempFolder: TemporaryFolder) {
             jcenter()
           }
           dependencies {
-            classpath 'com.android.tools.build:gradle:4.2.0-beta01'
+            classpath 'com.android.tools.build:gradle:4.2.0-beta04'
           }
         }
 

diff --git a/javatests/artifacts/dagger-android/simple/build.gradle b/javatests/artifacts/dagger-android/simple/build.gradle
@@ -16,7 +16,7 @@
 
 buildscript {
     ext {
-        agp_version = System.getenv('AGP_VERSION') ?: "4.2.0-beta01"
+        agp_version = System.getenv('AGP_VERSION') ?: "4.2.0-beta04"
     }
     repositories {
         google()

diff --git a/javatests/artifacts/hilt-android/simple/build.gradle b/javatests/artifacts/hilt-android/simple/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     ext {
         dagger_version = 'LOCAL-SNAPSHOT'
         kotlin_version = '1.3.61'
-        agp_version = System.getenv('AGP_VERSION') ?: "4.2.0-beta01"
+        agp_version = System.getenv('AGP_VERSION') ?: "4.2.0-beta04"
     }
     repositories {
         google()

diff --git a/javatests/artifacts/hilt-android/simpleKotlin/build.gradle b/javatests/artifacts/hilt-android/simpleKotlin/build.gradle
@@ -17,7 +17,7 @@
 buildscript {
     ext {
         kotlin_version = '1.3.61'
-        agp_version = System.getenv('AGP_VERSION') ?: "4.2.0-beta01"
+        agp_version = System.getenv('AGP_VERSION') ?: "4.2.0-beta04"
     }
     repositories {
         google()

diff --git a/util/run-local-tests.sh b/util/run-local-tests.sh
@@ -17,5 +17,5 @@ pushd examples/maven && mvn compile && popd
 # Run local gradle tests
 util/run-local-gradle-tests.sh
 util/run-local-gradle-android-tests.sh "4.1.0"
-util/run-local-gradle-android-tests.sh "4.2.0-beta01"
+util/run-local-gradle-android-tests.sh "4.2.0-beta04"