Skip to content

Commit cf00cca

Browse files
committed
Remove android-annotations upgrade since some new android failures https://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.
1 parent 51c3731 commit cf00cca

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

android-interop-testing/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ android {
3333

3434
defaultConfig {
3535
applicationId "io.grpc.android.integrationtest"
36-
minSdkVersion 21
36+
// Held back to 20 as Gradle fails to build at the 21 level. This is
37+
// presumably a Gradle bug that can be revisited later.
38+
// Maybe this issue: https://github.com/gradle/gradle/issues/20778
39+
minSdkVersion 20
3740
targetSdkVersion 33
3841
versionCode 1
3942
versionName "1.0"

android-interop-testing/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<!-- For UDS -->
77
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
88
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
9-
<uses-sdk tools:overrideLibrary="io.grpc.android" android:minSdkVersion="21"/>
9+
<uses-sdk tools:overrideLibrary="io.grpc.android"/>
1010

1111
<application
1212
android:allowBackup="true"

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ protobuf = "3.25.5"
1010

1111
[libraries]
1212
android-annotations = "com.google.android:annotations:4.1.1.4"
13-
androidx-annotation = "androidx.annotation:annotation:1.9.1"
13+
androidx-annotation = "androidx.annotation:annotation:1.9.0"
1414
androidx-core = "androidx.core:core:1.15.0"
1515
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.8.7"
1616
androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.8.7"

0 commit comments

Comments
 (0)