Skip to content

Commit f36defa

Browse files
authored
Upgrade dependencies
1 parent 337c7b8 commit f36defa

File tree

25 files changed

+150
-130
lines changed

25 files changed

+150
-130
lines changed

MODULE.bazel

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ module(
88
# GRPC_DEPS_START
99
IO_GRPC_GRPC_JAVA_ARTIFACTS = [
1010
"com.google.android:annotations:4.1.1.4",
11-
"com.google.api.grpc:proto-google-common-protos:2.59.2",
12-
"com.google.auth:google-auth-library-credentials:1.24.1",
13-
"com.google.auth:google-auth-library-oauth2-http:1.24.1",
11+
"com.google.api.grpc:proto-google-common-protos:2.63.1",
12+
"com.google.auth:google-auth-library-credentials:1.40.0",
13+
"com.google.auth:google-auth-library-oauth2-http:1.40.0",
1414
"com.google.auto.value:auto-value-annotations:1.11.0",
1515
"com.google.auto.value:auto-value:1.11.0",
1616
"com.google.code.findbugs:jsr305:3.0.2",
1717
"com.google.code.gson:gson:2.12.1",
18-
"com.google.errorprone:error_prone_annotations:2.36.0",
18+
"com.google.errorprone:error_prone_annotations:2.44.0",
1919
"com.google.guava:failureaccess:1.0.1",
20-
"com.google.guava:guava:33.4.8-android",
20+
"com.google.guava:guava:33.5.0-android",
2121
"com.google.re2j:re2j:1.8",
22-
"com.google.s2a.proto.v2:s2a-proto:0.1.2",
23-
"com.google.truth:truth:1.4.2",
22+
"com.google.s2a.proto.v2:s2a-proto:0.1.3",
23+
"com.google.truth:truth:1.4.5",
2424
"com.squareup.okhttp:okhttp:2.7.5",
2525
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
2626
"io.netty:netty-buffer:4.1.127.Final",
@@ -42,7 +42,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
4242
"io.perfmark:perfmark-api:0.27.0",
4343
"junit:junit:4.13.2",
4444
"org.checkerframework:checker-qual:3.49.5",
45-
"org.codehaus.mojo:animal-sniffer-annotations:1.24",
45+
"org.codehaus.mojo:animal-sniffer-annotations:1.26",
4646
]
4747
# GRPC_DEPS_END
4848

api/src/main/java/io/grpc/ConnectivityState.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* The connectivity states.
2121
*
2222
* @see <a href="https://github.com/grpc/grpc/blob/master/doc/connectivity-semantics-and-api.md">
23-
* more information</a>
23+
* more information</a>
2424
*/
2525
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/4359")
2626
public enum ConnectivityState {

api/src/main/java/io/grpc/LoadBalancerProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public abstract class LoadBalancerProvider extends LoadBalancer.Factory {
8181
* @return a tuple of the fully parsed and validated balancer configuration, else the Status.
8282
* @since 1.20.0
8383
* @see <a href="https://github.com/grpc/proposal/blob/master/A24-lb-policy-config.md">
84-
* A24-lb-policy-config.md</a>
84+
* A24-lb-policy-config.md</a>
8585
*/
8686
public ConfigOrError parseLoadBalancingPolicyConfig(Map<String, ?> rawLoadBalancingPolicyConfig) {
8787
return UNKNOWN_CONFIG;

authz/src/main/java/io/grpc/authz/AuthorizationPolicyTranslator.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,19 +156,19 @@ private static Map<String, Policy> parseRules(
156156
}
157157

158158
/**
159-
* Translates a gRPC authorization policy in JSON string to Envoy RBAC policies.
160-
* On success, will return one of the following -
161-
* 1. One allow RBAC policy or,
162-
* 2. Two RBAC policies, deny policy followed by allow policy.
163-
* If the policy cannot be parsed or is invalid, an exception will be thrown.
164-
*/
159+
* Translates a gRPC authorization policy in JSON string to Envoy RBAC policies.
160+
* On success, will return one of the following -
161+
* 1. One allow RBAC policy or,
162+
* 2. Two RBAC policies, deny policy followed by allow policy.
163+
* If the policy cannot be parsed or is invalid, an exception will be thrown.
164+
*/
165165
public static List<RBAC> translate(String authorizationPolicy)
166166
throws IllegalArgumentException, IOException {
167167
Object jsonObject = JsonParser.parse(authorizationPolicy);
168168
if (!(jsonObject instanceof Map)) {
169169
throw new IllegalArgumentException(
170-
"Authorization policy should be a JSON object. Found: "
171-
+ (jsonObject == null ? null : jsonObject.getClass()));
170+
"Authorization policy should be a JSON object. Found: "
171+
+ (jsonObject == null ? null : jsonObject.getClass()));
172172
}
173173
@SuppressWarnings("unchecked")
174174
Map<String, ?> json = (Map<String, ?>)jsonObject;

core/src/main/java/io/grpc/internal/DnsNameResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ private static long getNetworkAddressCacheTtlNanos(boolean isAndroid) {
478478
* Determines if a given Service Config choice applies, and if so, returns it.
479479
*
480480
* @see <a href="https://github.com/grpc/proposal/blob/master/A2-service-configs-in-dns.md">
481-
* Service Config in DNS</a>
481+
* Service Config in DNS</a>
482482
* @param choice The service config choice.
483483
* @return The service config object or {@code null} if this choice does not apply.
484484
*/

core/src/main/java/io/grpc/internal/JsonUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,8 @@ private static int parseNanos(String value) throws ParseException {
361361
/**
362362
* Copy of {@link com.google.protobuf.util.Durations#normalizedDuration}.
363363
*/
364-
@SuppressWarnings("NarrowingCompoundAssignment")
364+
// Math.addExact() requires Android API level 24
365+
@SuppressWarnings({"NarrowingCompoundAssignment", "InlineMeInliner"})
365366
private static long normalizedDuration(long seconds, int nanos) {
366367
if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
367368
seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);

core/src/main/java/io/grpc/internal/ManagedChannelImplBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ List<ClientInterceptor> getEffectiveInterceptors(String computedTarget) {
759759
if (GET_CLIENT_INTERCEPTOR_METHOD != null) {
760760
try {
761761
statsInterceptor =
762-
(ClientInterceptor) GET_CLIENT_INTERCEPTOR_METHOD
762+
(ClientInterceptor) GET_CLIENT_INTERCEPTOR_METHOD
763763
.invoke(
764764
null,
765765
recordStartedRpcs,

core/src/test/java/io/grpc/internal/DelayedClientCallTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public void delayedCallsRunUnderContext() throws Exception {
206206
Object goldenValue = new Object();
207207
DelayedClientCall<String, Integer> delayedClientCall =
208208
Context.current().withValue(contextKey, goldenValue).call(() ->
209-
new DelayedClientCall<>(callExecutor, fakeClock.getScheduledExecutorService(), null));
209+
new DelayedClientCall<>(callExecutor, fakeClock.getScheduledExecutorService(), null));
210210
AtomicReference<Context> readyContext = new AtomicReference<>();
211211
delayedClientCall.start(new ClientCall.Listener<Integer>() {
212212
@Override public void onReady() {

examples/android/clientcache/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ dependencies {
5959
implementation 'io.grpc:grpc-stub:1.78.0-SNAPSHOT' // CURRENT_GRPC_VERSION
6060

6161
testImplementation 'junit:junit:4.13.2'
62-
testImplementation 'com.google.truth:truth:1.1.5'
62+
testImplementation 'com.google.truth:truth:1.4.5'
6363
testImplementation 'io.grpc:grpc-testing:1.78.0-SNAPSHOT' // CURRENT_GRPC_VERSION
6464
}

examples/example-gauth/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
3131
implementation "io.grpc:grpc-stub:${grpcVersion}"
3232
implementation "io.grpc:grpc-auth:${grpcVersion}"
33-
implementation "com.google.auth:google-auth-library-oauth2-http:1.23.0"
33+
implementation "com.google.auth:google-auth-library-oauth2-http:1.40.0"
3434
implementation "com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24"
3535
runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}"
3636
}

0 commit comments

Comments
 (0)