Downgrade androidx.core

ejona86 · ejona86 · commit 40b58735b428 · 2026-03-11T15:52:28.000-07:00
diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle
@@ -29,7 +29,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 35
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "io.grpc.android.integrationtest"
diff --git a/android/build.gradle b/android/build.gradle
@@ -12,7 +12,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 35
+    compileSdkVersion 34
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 33
diff --git a/binder/build.gradle b/binder/build.gradle
@@ -7,7 +7,7 @@ description = 'gRPC BinderChannel'
 
 android {
     namespace = 'io.grpc.binder'
-    compileSdkVersion 35
+    compileSdkVersion 34
     compileOptions {
         sourceCompatibility 1.8
         targetCompatibility 1.8
diff --git a/cronet/build.gradle b/cronet/build.gradle
@@ -12,7 +12,7 @@ repositories {
 
 android {
     namespace = 'io.grpc.cronet'
-    compileSdkVersion 35
+    compileSdkVersion 33
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 33
diff --git a/examples/android/clientcache/app/build.gradle b/examples/android/clientcache/app/build.gradle
@@ -6,7 +6,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 35
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "io.grpc.clientcacheexample"
diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
@@ -6,7 +6,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 35
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "io.grpc.helloworldexample"
diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle
@@ -6,7 +6,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 35
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "io.grpc.routeguideexample"
diff --git a/examples/android/strictmode/app/build.gradle b/examples/android/strictmode/app/build.gradle
@@ -6,7 +6,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 35
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "io.grpc.strictmodehelloworldexample"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,9 +6,13 @@ android-annotations = "com.google.android:annotations:4.1.1.4"
 # 1.9.1+ uses Kotlin and requires Android Gradle Plugin 9+
 # checkForUpdates: androidx-annotation:1.9.0
 androidx-annotation = "androidx.annotation:annotation:1.9.0"
+# 1.14.x doesn't exist.
+# 1.15.0+ requires compileSdkVersion 35 which officially requires AGP 8.6.0+.
+# It might work before then, but AGP 7.4.1 fails with:
+#   RES_TABLE_TYPE_TYPE entry offsets overlap actual entry data.
 # 1.16.0+ requires AGP 8.6.0+
-# checkForUpdates: androidx-core:1.15.+
-androidx-core = "androidx.core:core:1.15.0"
+# checkForUpdates: androidx-core:1.13.+
+androidx-core = "androidx.core:core:1.13.1"
 # 2.9+ requires AGP 8.1.1+
 # checkForUpdates: androidx-lifecycle-common:2.8.+
 androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.8.7"

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ android {`
`29`	`29`	`sourceCompatibility JavaVersion.VERSION_1_8`
`30`	`30`	`targetCompatibility JavaVersion.VERSION_1_8`
`31`	`31`	`}`
`32`		`- compileSdkVersion 35`
	`32`	`+ compileSdkVersion 34`
`33`	`33`
`34`	`34`	`defaultConfig {`
`35`	`35`	`applicationId "io.grpc.android.integrationtest"`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ android {`
`12`	`12`	`sourceCompatibility JavaVersion.VERSION_1_8`
`13`	`13`	`targetCompatibility JavaVersion.VERSION_1_8`
`14`	`14`	`}`
`15`		`- compileSdkVersion 35`
	`15`	`+ compileSdkVersion 34`
`16`	`16`	`defaultConfig {`
`17`	`17`	`minSdkVersion 23`
`18`	`18`	`targetSdkVersion 33`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ android {`
`6`	`6`	`sourceCompatibility JavaVersion.VERSION_1_8`
`7`	`7`	`targetCompatibility JavaVersion.VERSION_1_8`
`8`	`8`	`}`
`9`		`- compileSdkVersion 35`
	`9`	`+ compileSdkVersion 34`
`10`	`10`
`11`	`11`	`defaultConfig {`
`12`	`12`	`applicationId "io.grpc.clientcacheexample"`