Update annotation-experimental dependency to latest version.

RELNOTES=n/a PiperOrigin-RevId: 586804123
google · Nov 30, 2023 · b074037 · b074037
1 parent e0b9b8e
commit b074037
Show file tree

Hide file tree

Showing 19 changed files with 727 additions and 677 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -176,7 +176,7 @@ KSP_VERSION = KOTLIN_VERSION + "-1.0.14"
 maven_install(
     artifacts = [
         "androidx.annotation:annotation:1.1.0",
-        "androidx.annotation:annotation-experimental:1.2.0",
+        "androidx.annotation:annotation-experimental:1.3.1",
         "androidx.appcompat:appcompat:1.3.1",
         "androidx.activity:activity:1.5.1",
         "androidx.fragment:fragment:1.5.1",

diff --git a/java/dagger/hilt/android/plugin/main/src/test/data/android-libraryA/build.gradle b/java/dagger/hilt/android/plugin/main/src/test/data/android-libraryA/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    compileSdkVersion 33
+    buildToolsVersion "33.0.0"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }

diff --git a/java/dagger/hilt/android/plugin/main/src/test/data/android-libraryC/build.gradle b/java/dagger/hilt/android/plugin/main/src/test/data/android-libraryC/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    compileSdkVersion 33
+    buildToolsVersion "33.0.0"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }

diff --git a/java/dagger/hilt/android/plugin/main/src/test/data/flavored-project/app/build.gradle b/java/dagger/hilt/android/plugin/main/src/test/data/flavored-project/app/build.gradle
@@ -20,8 +20,8 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    compileSdkVersion 33
+    buildToolsVersion "33.0.0"
 
     flavorDimensions 'api', 'version'
     productFlavors {
@@ -46,7 +46,7 @@ android {
     defaultConfig {
         applicationId "simple.app"
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 33
     }
 
     compileOptions {

diff --git a/java/dagger/hilt/android/plugin/main/src/test/data/flavored-project/feature/build.gradle b/java/dagger/hilt/android/plugin/main/src/test/data/flavored-project/feature/build.gradle
@@ -20,8 +20,8 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    compileSdkVersion 33
+    buildToolsVersion "33.0.0"
 
     flavorDimensions 'api', 'version'
     productFlavors {
@@ -45,7 +45,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 32
+        targetSdkVersion 33
     }
 
     compileOptions {

diff --git a/...agger/hilt/android/plugin/main/src/test/data/simple-project-for-agp-test/app/build.gradle b/...agger/hilt/android/plugin/main/src/test/data/simple-project-for-agp-test/app/build.gradle
@@ -20,13 +20,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
     namespace "simple.app"
 
     defaultConfig {
         applicationId "simple.app"
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 33
     }
 
     compileOptions {

diff --git a/...r/hilt/android/plugin/main/src/test/data/simple-project-for-agp-test/feature/build.gradle b/...r/hilt/android/plugin/main/src/test/data/simple-project-for-agp-test/feature/build.gradle
@@ -20,12 +20,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
     namespace "simple.library"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 32
+        targetSdkVersion 33
     }
 
     compileOptions {

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
@@ -156,13 +156,13 @@ class GradleTestRunner(val tempFolder: TemporaryFolder) {
         }
 
         android {
-          compileSdkVersion 32
-          buildToolsVersion "32.0.0"
+          compileSdkVersion 33
+          buildToolsVersion "33.0.0"
 
           defaultConfig {
             ${ if (isAppProject) "applicationId \"plugin.test\"" else "" }
             minSdkVersion 21
-            targetSdkVersion 32
+            targetSdkVersion 33
           }
 
           compileOptions {
@@ -189,7 +189,8 @@ class GradleTestRunner(val tempFolder: TemporaryFolder) {
           ${hiltOptions.joinToString(separator = "\n")}
         }
         ${additionalClosures.joinToString(separator = "\n")}
-        """.trimIndent()
+        """
+            .trimIndent()
         )
       }
   }
@@ -198,11 +199,14 @@ class GradleTestRunner(val tempFolder: TemporaryFolder) {
     gradlePropertiesFile?.delete()
     gradlePropertiesFile =
       tempFolder.newFile("gradle.properties").apply {
-        writeText("""
+        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())
+        """
+            .trimIndent()
+        )
       }
   }
 
@@ -220,7 +224,8 @@ class GradleTestRunner(val tempFolder: TemporaryFolder) {
                 ${activities.joinToString(separator = "\n")}
             </application>
         </manifest>
-        """.trimIndent()
+        """
+            .trimIndent()
         )
       }
   }