Update Dagger/Hilt artifact tests to use kotlin 1.9

RELNOTES=N/A PiperOrigin-RevId: 558176324
google · Aug 18, 2023 · f8334d8 · f8334d8
1 parent b37cffd
commit f8334d8
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 17 deletions.
diff --git a/java/dagger/hilt/android/plugin/build.gradle b/java/dagger/hilt/android/plugin/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
   ext {
-    kotlin_version = "1.8.20"
+    kotlin_version = "1.9.0"
     agp_version = System.getenv('AGP_VERSION') ?: "7.2.0"
-    ksp_version = "$kotlin_version-1.0.11"
+    ksp_version = "$kotlin_version-1.0.12"
     pluginArtifactId = 'hilt-android-gradle-plugin'
     pluginId = 'com.google.dagger.hilt.android'
   }

diff --git a/java/dagger/hilt/android/plugin/main/build.gradle b/java/dagger/hilt/android/plugin/main/build.gradle
@@ -72,9 +72,9 @@ dependencies {
   testImplementation 'junit:junit:4.12'
   testImplementation 'com.google.truth:truth:1.0.1'
   testImplementation 'org.javassist:javassist:3.26.0-GA'
-  testPluginCompile 'com.android.tools.build:gradle:7.1.2'
-  testPluginCompile 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
-  testPluginCompile 'com.google.devtools.ksp:symbol-processing-gradle-plugin:1.8.0-1.0.9'
+  testPluginCompile "com.android.tools.build:gradle:$agp_version"
+  testPluginCompile "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+  testPluginCompile "com.google.devtools.ksp:symbol-processing-gradle-plugin:$ksp_version"
 }
 
 // Configure the generating task of plugin-under-test-metadata.properties to

diff --git a/java/dagger/hilt/android/plugin/main/src/test/kotlin/BuildCacheTest.kt b/java/dagger/hilt/android/plugin/main/src/test/kotlin/BuildCacheTest.kt
@@ -82,8 +82,6 @@ class BuildCacheTest(private val enableAggregatingTask: Boolean) {
     val secondResult = secondGradleRunner.build()
     val cacheableTasks: List<String> =
       mutableListOf<String>().apply {
-        add(":checkDebugAarMetadata")
-        add(":checkDebugDuplicateClasses")
         add(":compileDebugJavaWithJavac")
         add(":compressDebugAssets")
         add(":desugarDebugFileDependencies")
@@ -105,9 +103,6 @@ class BuildCacheTest(private val enableAggregatingTask: Boolean) {
         add(":mergeProjectDexDebug")
         add(":processDebugManifestForPackage")
         add(":transformDebugClassesWithAsm")
-        add(":validateSigningDebug")
-        add(":writeDebugAppMetadata")
-        add(":writeDebugSigningConfigVersions")
       }
 
     val tasksFromCache =

diff --git a/java/dagger/hilt/android/plugin/main/src/test/kotlin/GradleTestRunner.kt b/java/dagger/hilt/android/plugin/main/src/test/kotlin/GradleTestRunner.kt
@@ -200,6 +200,8 @@ class GradleTestRunner(val tempFolder: TemporaryFolder) {
       tempFolder.newFile("gradle.properties").apply {
         writeText("""
         android.useAndroidX=true
+        // TODO(b/296583777): See if there's a better way to fix the OOM error.
+        org.gradle.jvmargs=-XX:MaxMetaspaceSize=1g
         """.trimIndent())
       }
   }

diff --git a/javatests/artifacts/dagger-ksp/build.gradle b/javatests/artifacts/dagger-ksp/build.gradle
@@ -17,8 +17,8 @@
 buildscript {
   ext {
     dagger_version = "LOCAL-SNAPSHOT"
-    kotlin_version = "1.8.0"
-    ksp_version = "1.8.0-1.0.9"
+    kotlin_version = "1.9.0"
+    ksp_version = "$kotlin_version-1.0.12"
     junit_version = "4.13"
     truth_version = "1.0.1"
   }

diff --git a/javatests/artifacts/dagger/build.gradle b/javatests/artifacts/dagger/build.gradle
@@ -17,7 +17,7 @@
 buildscript {
   ext {
     dagger_version = "LOCAL-SNAPSHOT"
-    kotlin_version = "1.8.0"
+    kotlin_version = "1.9.0"
     junit_version = "4.13"
     truth_version = "1.0.1"
   }

diff --git a/javatests/artifacts/hilt-android/simple/build.gradle b/javatests/artifacts/hilt-android/simple/build.gradle
@@ -17,7 +17,7 @@
 buildscript {
     ext {
         dagger_version = 'LOCAL-SNAPSHOT'
-        kotlin_version = '1.8.0'
+        kotlin_version = '1.9.0'
         agp_version = System.getenv('AGP_VERSION') ?: "7.1.2"
     }
     repositories {

diff --git a/javatests/artifacts/hilt-android/simpleKotlin/build.gradle b/javatests/artifacts/hilt-android/simpleKotlin/build.gradle
@@ -16,8 +16,8 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.8.20'
-        ksp_version = '1.0.11'
+        kotlin_version = '1.9.0'
+        ksp_version = "$kotlin_version-1.0.12"
         agp_version = System.getenv('AGP_VERSION') ?: "7.1.2"
     }
     repositories {
@@ -28,7 +28,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:$agp_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:$kotlin_version-$ksp_version"
+        classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:$ksp_version"
         classpath 'com.google.dagger:hilt-android-gradle-plugin:LOCAL-SNAPSHOT'
     }
 }