Remove android-annotations upgrade since some new android failures ht…

…tps://btx.cloud.google.com/invocations/34711993-f33f-423f-bb91-3e74c9affda4/targets/grpc%2Fjava%2Fmaster%2Fpresubmit%2Flinux_artifacts/log are still occurring after trying min sdk version 21.
kannanjgithub · Feb 11, 2025 · cf00cca · cf00cca
1 parent 51c3731
commit cf00cca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle
@@ -33,7 +33,10 @@ android {
 
     defaultConfig {
         applicationId "io.grpc.android.integrationtest"
-        minSdkVersion 21
+        // Held back to 20 as Gradle fails to build at the 21 level. This is
+        // presumably a Gradle bug that can be revisited later.
+        // Maybe this issue: https://github.com/gradle/gradle/issues/20778
+        minSdkVersion 20
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"

diff --git a/android-interop-testing/src/main/AndroidManifest.xml b/android-interop-testing/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
     <!-- For UDS -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-sdk tools:overrideLibrary="io.grpc.android" android:minSdkVersion="21"/>
+    <uses-sdk tools:overrideLibrary="io.grpc.android"/>
 
     <application
         android:allowBackup="true"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ protobuf = "3.25.5"
 
 [libraries]
 android-annotations = "com.google.android:annotations:4.1.1.4"
-androidx-annotation = "androidx.annotation:annotation:1.9.1"
+androidx-annotation = "androidx.annotation:annotation:1.9.0"
 androidx-core = "androidx.core:core:1.15.0"
 androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.8.7"
 androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.8.7"