mirror of https://github.com/grpc/grpc-java.git
Upgrade dependencies (#10178)
Required bumping android compile/targetSdkVersion to 33
This commit is contained in:
parent
e38d928f75
commit
e0ac97c4fd
|
@ -30,12 +30,12 @@ android {
|
|||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
compileSdkVersion 31
|
||||
compileSdkVersion 33
|
||||
|
||||
defaultConfig {
|
||||
applicationId "io.grpc.android.integrationtest"
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 31
|
||||
targetSdkVersion 33
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
|
|
|
@ -12,11 +12,11 @@ android {
|
|||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
compileSdkVersion 31
|
||||
compileSdkVersion 33
|
||||
defaultConfig {
|
||||
consumerProguardFiles "proguard-rules.txt"
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 31
|
||||
targetSdkVersion 33
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
|
|
|
@ -7,14 +7,14 @@ description = 'gRPC BinderChannel'
|
|||
|
||||
android {
|
||||
namespace 'io.grpc.binder'
|
||||
compileSdkVersion 31
|
||||
compileSdkVersion 33
|
||||
compileOptions {
|
||||
sourceCompatibility 1.8
|
||||
targetCompatibility 1.8
|
||||
}
|
||||
defaultConfig {
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 31
|
||||
targetSdkVersion 33
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
|
|
|
@ -13,10 +13,10 @@ repositories {
|
|||
|
||||
android {
|
||||
namespace 'io.grpc.cronet'
|
||||
compileSdkVersion 31
|
||||
compileSdkVersion 33
|
||||
defaultConfig {
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 31
|
||||
targetSdkVersion 33
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
|
|
|
@ -6,12 +6,12 @@ android {
|
|||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
compileSdkVersion 31
|
||||
compileSdkVersion 33
|
||||
|
||||
defaultConfig {
|
||||
applicationId "io.grpc.clientcacheexample"
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 31
|
||||
targetSdkVersion 33
|
||||
multiDexEnabled true
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
|
|
|
@ -6,12 +6,12 @@ android {
|
|||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
compileSdkVersion 31
|
||||
compileSdkVersion 33
|
||||
|
||||
defaultConfig {
|
||||
applicationId "io.grpc.helloworldexample"
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 31
|
||||
targetSdkVersion 33
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
}
|
||||
|
|
|
@ -6,12 +6,12 @@ android {
|
|||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
compileSdkVersion 31
|
||||
compileSdkVersion 33
|
||||
|
||||
defaultConfig {
|
||||
applicationId "io.grpc.routeguideexample"
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 31
|
||||
targetSdkVersion 33
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
}
|
||||
|
|
|
@ -6,13 +6,13 @@ android {
|
|||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
compileSdkVersion 31
|
||||
compileSdkVersion 33
|
||||
|
||||
defaultConfig {
|
||||
applicationId "io.grpc.strictmodehelloworldexample"
|
||||
// API level 28 is required for StrictMode penaltyListener
|
||||
minSdkVersion 28
|
||||
targetSdkVersion 31
|
||||
targetSdkVersion 33
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
}
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
<dependency>
|
||||
<groupId>com.google.code.gson</groupId>
|
||||
<artifactId>gson</artifactId>
|
||||
<version>2.9.0</version> <!-- prevent downgrade via protobuf-java-util -->
|
||||
<version>2.10.1</version> <!-- prevent downgrade via protobuf-java-util -->
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
|
|
|
@ -56,11 +56,10 @@ dependencies {
|
|||
project(':grpc-core'), // Align grpc versions
|
||||
project(':grpc-grpclb'), // Align grpc versions
|
||||
project(':grpc-services'), // Align grpc versions
|
||||
libraries.animalsniffer.annotations, // Use our newer version
|
||||
libraries.guava.jre, // Use our newer version
|
||||
libraries.protobuf.java.util, // Use our newer version
|
||||
('com.google.api.grpc:proto-google-common-protos:2.14.2'),
|
||||
('com.google.auth:google-auth-library-oauth2-http:1.16.0'),
|
||||
('io.opencensus:opencensus-api:0.31.1'),
|
||||
('com.google.guava:guava:31.1-jre')
|
||||
libraries.re2j // Use our newer version
|
||||
|
||||
testImplementation testFixtures(project(':grpc-context')),
|
||||
project(':grpc-testing'),
|
||||
|
|
|
@ -1,38 +1,38 @@
|
|||
[versions]
|
||||
autovalue = "1.9"
|
||||
# Compatibility problem with internal version getting onto 1.5.3.
|
||||
# https://github.com/grpc/grpc-java/pull/9118
|
||||
googleauth = "1.4.0"
|
||||
guava = "31.1-android"
|
||||
netty = '4.1.87.Final'
|
||||
nettytcnative = '2.0.56.Final'
|
||||
opencensus = "0.31.0"
|
||||
opencensus = "0.31.1"
|
||||
protobuf = "3.22.3"
|
||||
|
||||
[libraries]
|
||||
android-annotations = "com.google.android:annotations:4.1.1.4"
|
||||
androidx-annotation = "androidx.annotation:annotation:1.4.0"
|
||||
androidx-core = "androidx.core:core:1.3.0"
|
||||
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.3.0"
|
||||
androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.3.0"
|
||||
androidx-test-core = "androidx.test:core:1.4.0"
|
||||
androidx-test-ext-junit = "androidx.test.ext:junit:1.1.3"
|
||||
androidx-test-rules = "androidx.test:rules:1.4.0"
|
||||
# Breaks on upgrade: https://github.com/mojohaus/animal-sniffer/issues/131
|
||||
animalsniffer = "org.codehaus.mojo:animal-sniffer:1.18"
|
||||
animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.21"
|
||||
auto-value = { module = "com.google.auto.value:auto-value", version.ref = "autovalue" }
|
||||
auto-value-annotations = { module = "com.google.auto.value:auto-value-annotations", version.ref = "autovalue" }
|
||||
androidx-annotation = "androidx.annotation:annotation:1.6.0"
|
||||
androidx-core = "androidx.core:core:1.10.0"
|
||||
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.6.1"
|
||||
androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.6.1"
|
||||
androidx-test-core = "androidx.test:core:1.5.0"
|
||||
androidx-test-ext-junit = "androidx.test.ext:junit:1.1.5"
|
||||
androidx-test-rules = "androidx.test:rules:1.5.0"
|
||||
animalsniffer = "org.codehaus.mojo:animal-sniffer:1.23"
|
||||
animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.23"
|
||||
auto-value = "com.google.auto.value:auto-value:1.10.1"
|
||||
auto-value-annotations = "com.google.auto.value:auto-value-annotations:1.10.1"
|
||||
checkstyle = "com.puppycrawl.tools:checkstyle:8.28"
|
||||
commons-math3 = "org.apache.commons:commons-math3:3.6.1"
|
||||
conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"
|
||||
cronet-api = "org.chromium.net:cronet-api:92.4515.131"
|
||||
cronet-embedded = "org.chromium.net:cronet-embedded:102.5005.125"
|
||||
cronet-api = "org.chromium.net:cronet-api:108.5359.79"
|
||||
cronet-embedded = "org.chromium.net:cronet-embedded:108.5359.79"
|
||||
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.18.0"
|
||||
errorprone-corejava8 = "com.google.errorprone:error_prone_core:2.10.0"
|
||||
errorprone-core = "com.google.errorprone:error_prone_core:2.18.0"
|
||||
google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.9.0"
|
||||
google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.17.0"
|
||||
google-auth-credentials = { module = "com.google.auth:google-auth-library-credentials", version.ref = "googleauth" }
|
||||
google-auth-oauth2Http = { module = "com.google.auth:google-auth-library-oauth2-http", version.ref = "googleauth" }
|
||||
gson = "com.google.code.gson:gson:2.9.0"
|
||||
gson = "com.google.code.gson:gson:2.10.1"
|
||||
guava = { module = "com.google.guava:guava", version.ref = "guava" }
|
||||
guava-betaChecker = "com.google.guava:guava-beta-checker:1.0"
|
||||
guava-testlib = { module = "com.google.guava:guava-testlib", version.ref = "guava" }
|
||||
|
@ -42,7 +42,7 @@ javax-annotation = "org.apache.tomcat:annotations-api:6.0.53"
|
|||
jetty-alpn-agent = "org.mortbay.jetty.alpn:jetty-alpn-agent:2.0.10"
|
||||
jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
|
||||
junit = "junit:junit:4.13.2"
|
||||
mockito-android = "org.mockito:mockito-android:3.8.0"
|
||||
mockito-android = "org.mockito:mockito-android:3.12.4"
|
||||
mockito-core = "org.mockito:mockito-core:3.12.4"
|
||||
netty-codec-http2 = { module = "io.netty:netty-codec-http2", version.ref = "netty" }
|
||||
netty-handler-proxy = { module = "io.netty:netty-handler-proxy", version.ref = "netty" }
|
||||
|
@ -62,13 +62,16 @@ opencensus-exporter-stats-stackdriver = { module = "io.opencensus:opencensus-exp
|
|||
opencensus-exporter-trace-stackdriver = { module = "io.opencensus:opencensus-exporter-trace-stackdriver", version.ref = "opencensus" }
|
||||
opencensus-impl = { module = "io.opencensus:opencensus-impl", version.ref = "opencensus" }
|
||||
opencensus-proto = "io.opencensus:opencensus-proto:0.2.0"
|
||||
perfmark-api = "io.perfmark:perfmark-api:0.25.0"
|
||||
perfmark-api = "io.perfmark:perfmark-api:0.26.0"
|
||||
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
|
||||
protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protobuf" }
|
||||
protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "protobuf" }
|
||||
protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
|
||||
re2j = "com.google.re2j:re2j:1.6"
|
||||
robolectric = "org.robolectric:robolectric:4.8.1"
|
||||
re2j = "com.google.re2j:re2j:1.7"
|
||||
# Compilation failed with 4.10.2 due to native graphics, or something. We don't
|
||||
# use it, but it seemed the compiler felt it needed the definition
|
||||
robolectric = "org.robolectric:robolectric:4.9.2"
|
||||
signature-android = "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4"
|
||||
signature-java = "org.codehaus.mojo.signature:java18:1.0"
|
||||
# 1.1+ requires Java 8, but we still use Java 7 with grpc-context
|
||||
truth = "com.google.truth:truth:1.0.1"
|
||||
|
|
|
@ -11,18 +11,17 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
|||
# )
|
||||
IO_GRPC_GRPC_JAVA_ARTIFACTS = [
|
||||
"com.google.android:annotations:4.1.1.4",
|
||||
"com.google.api.grpc:proto-google-common-protos:2.9.0",
|
||||
"com.google.auth:google-auth-library-credentials:0.22.0",
|
||||
"com.google.auth:google-auth-library-oauth2-http:0.22.0",
|
||||
"com.google.auto.value:auto-value-annotations:1.9",
|
||||
"com.google.auto.value:auto-value:1.9",
|
||||
"com.google.api.grpc:proto-google-common-protos:2.17.0",
|
||||
"com.google.auth:google-auth-library-credentials:1.4.0",
|
||||
"com.google.auth:google-auth-library-oauth2-http:1.4.0",
|
||||
"com.google.auto.value:auto-value-annotations:1.10.1",
|
||||
"com.google.auto.value:auto-value:1.10.1",
|
||||
"com.google.code.findbugs:jsr305:3.0.2",
|
||||
"com.google.code.gson:gson:2.9.0",
|
||||
"com.google.errorprone:error_prone_annotations:2.9.0",
|
||||
"com.google.code.gson:gson:2.10.1",
|
||||
"com.google.errorprone:error_prone_annotations:2.18.0",
|
||||
"com.google.guava:failureaccess:1.0.1",
|
||||
"com.google.guava:guava:31.0.1-android",
|
||||
"com.google.j2objc:j2objc-annotations:1.3",
|
||||
"com.google.re2j:re2j:1.6",
|
||||
"com.google.guava:guava:31.1-android",
|
||||
"com.google.re2j:re2j:1.7",
|
||||
"com.google.truth:truth:1.0.1",
|
||||
"com.squareup.okhttp:okhttp:2.7.5",
|
||||
"com.squareup.okio:okio:1.17.5",
|
||||
|
@ -40,12 +39,12 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
|
|||
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.87.Final",
|
||||
"io.netty:netty-transport-native-unix-common:4.1.87.Final",
|
||||
"io.netty:netty-transport:4.1.87.Final",
|
||||
"io.opencensus:opencensus-api:0.24.0",
|
||||
"io.opencensus:opencensus-contrib-grpc-metrics:0.24.0",
|
||||
"io.perfmark:perfmark-api:0.25.0",
|
||||
"junit:junit:4.12",
|
||||
"io.opencensus:opencensus-api:0.31.0",
|
||||
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
|
||||
"io.perfmark:perfmark-api:0.26.0",
|
||||
"junit:junit:4.13.2",
|
||||
"org.apache.tomcat:annotations-api:6.0.53",
|
||||
"org.codehaus.mojo:animal-sniffer-annotations:1.21",
|
||||
"org.codehaus.mojo:animal-sniffer-annotations:1.23",
|
||||
]
|
||||
|
||||
# For use with maven_install's override_targets.
|
||||
|
|
Loading…
Reference in New Issue