resolve merge conflicts

Author: shivaspeaks

.gemini/config.yaml

@@ -0,0 +1,13 @@
+have_fun: false
+memory_config:
+  disabled: false
+code_review:
+  disable: false
+  comment_severity_threshold: MEDIUM
+  max_review_comments: -1
+  pull_request_opened:
+    help: false
+    summary: false
+    code_review: false
+    include_drafts: false
+ignore_patterns: []

MODULE.bazel

@@ -1,21 +1,21 @@
 module(
     name = "grpc-java",
-    version = "1.80.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
+    version = "1.82.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
     compatibility_level = 0,
     repo_name = "io_grpc_grpc_java",
 )
 
 # GRPC_DEPS_START
 IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "com.google.android:annotations:4.1.1.4",
-    "com.google.api.grpc:proto-google-common-protos:2.63.2",
-    "com.google.auth:google-auth-library-credentials:1.41.0",
-    "com.google.auth:google-auth-library-oauth2-http:1.41.0",
+    "com.google.api.grpc:proto-google-common-protos:2.64.1",
+    "com.google.auth:google-auth-library-credentials:1.42.1",
+    "com.google.auth:google-auth-library-oauth2-http:1.42.1",
     "com.google.auto.value:auto-value-annotations:1.11.0",
     "com.google.auto.value:auto-value:1.11.0",
     "com.google.code.findbugs:jsr305:3.0.2",
-    "com.google.code.gson:gson:2.12.1",
-    "com.google.errorprone:error_prone_annotations:2.45.0",
+    "com.google.code.gson:gson:2.13.2",
+    "com.google.errorprone:error_prone_annotations:2.48.0",
     "com.google.guava:failureaccess:1.0.1",
     "com.google.guava:guava:33.5.0-android",
     "com.google.re2j:re2j:1.8",
@@ -26,26 +26,27 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "dev.cel:common:0.12.0",
     "com.squareup.okhttp:okhttp:2.7.5",
     "com.squareup.okio:okio:2.10.0",  # 3.0+ needs swapping to -jvm; need work to avoid flag-day
-    "io.netty:netty-buffer:4.1.130.Final",
-    "io.netty:netty-codec-http2:4.1.130.Final",
-    "io.netty:netty-codec-http:4.1.130.Final",
-    "io.netty:netty-codec-socks:4.1.130.Final",
-    "io.netty:netty-codec:4.1.130.Final",
-    "io.netty:netty-common:4.1.130.Final",
-    "io.netty:netty-handler-proxy:4.1.130.Final",
-    "io.netty:netty-handler:4.1.130.Final",
-    "io.netty:netty-resolver:4.1.130.Final",
-    "io.netty:netty-tcnative-boringssl-static:2.0.74.Final",
-    "io.netty:netty-tcnative-classes:2.0.74.Final",
-    "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.130.Final",
-    "io.netty:netty-transport-native-unix-common:4.1.130.Final",
-    "io.netty:netty-transport:4.1.130.Final",
+    "io.netty:netty-buffer:4.1.132.Final",
+    "io.netty:netty-codec-http2:4.1.132.Final",
+    "io.netty:netty-codec-http:4.1.132.Final",
+    "io.netty:netty-codec-socks:4.1.132.Final",
+    "io.netty:netty-codec:4.1.132.Final",
+    "io.netty:netty-common:4.1.132.Final",
+    "io.netty:netty-handler-proxy:4.1.132.Final",
+    "io.netty:netty-handler:4.1.132.Final",
+    "io.netty:netty-resolver:4.1.132.Final",
+    "io.netty:netty-tcnative-boringssl-static:2.0.75.Final",
+    "io.netty:netty-tcnative-classes:2.0.75.Final",
+    "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.132.Final",
+    "io.netty:netty-transport-native-unix-common:4.1.132.Final",
+    "io.netty:netty-transport:4.1.132.Final",
     "io.opencensus:opencensus-api:0.31.0",
     "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
     "io.perfmark:perfmark-api:0.27.0",
     "junit:junit:4.13.2",
+    "org.mockito:mockito-core:4.4.0",
     "org.checkerframework:checker-qual:3.49.5",
-    "org.codehaus.mojo:animal-sniffer-annotations:1.26",
+    "org.codehaus.mojo:animal-sniffer-annotations:1.27",
 ]
 # GRPC_DEPS_END
 

README.md

@@ -20,7 +20,7 @@ gRPC-Java - An RPC library and framework
 Supported Platforms
 -------------------
 
-gRPC-Java supports Java 8 and later. Android minSdkVersion 21 (Lollipop) and
+gRPC-Java supports Java 8 and later. Android minSdkVersion 23 (Marshmallow) and
 later are supported with [Java 8 language desugaring][android-java-8].
 
 TLS usage on Android typically requires Play Services Dynamic Security Provider.
@@ -44,8 +44,8 @@ For a guided tour, take a look at the [quick start
 guide](https://grpc.io/docs/languages/java/quickstart) or the more explanatory [gRPC
 basics](https://grpc.io/docs/languages/java/basics).
 
-The [examples](https://github.com/grpc/grpc-java/tree/v1.78.0/examples) and the
-[Android example](https://github.com/grpc/grpc-java/tree/v1.78.0/examples/android)
+The [examples](https://github.com/grpc/grpc-java/tree/v1.80.0/examples) and the
+[Android example](https://github.com/grpc/grpc-java/tree/v1.80.0/examples/android)
 are standalone projects that showcase the usage of gRPC.
 
 Download
@@ -56,42 +56,42 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-netty-shaded</artifactId>
-  <version>1.78.0</version>
+  <version>1.80.0</version>
   <scope>runtime</scope>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-protobuf</artifactId>
-  <version>1.78.0</version>
+  <version>1.80.0</version>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-stub</artifactId>
-  <version>1.78.0</version>
+  <version>1.80.0</version>
 </dependency>
 ```
 
 Or for Gradle with non-Android, add to your dependencies:
 ```gradle
-runtimeOnly 'io.grpc:grpc-netty-shaded:1.78.0'
-implementation 'io.grpc:grpc-protobuf:1.78.0'
-implementation 'io.grpc:grpc-stub:1.78.0'
+runtimeOnly 'io.grpc:grpc-netty-shaded:1.80.0'
+implementation 'io.grpc:grpc-protobuf:1.80.0'
+implementation 'io.grpc:grpc-stub:1.80.0'
 ```
 
 For Android client, use `grpc-okhttp` instead of `grpc-netty-shaded` and
 `grpc-protobuf-lite` instead of `grpc-protobuf`:
 ```gradle
-implementation 'io.grpc:grpc-okhttp:1.78.0'
-implementation 'io.grpc:grpc-protobuf-lite:1.78.0'
-implementation 'io.grpc:grpc-stub:1.78.0'
+implementation 'io.grpc:grpc-okhttp:1.80.0'
+implementation 'io.grpc:grpc-protobuf-lite:1.80.0'
+implementation 'io.grpc:grpc-stub:1.80.0'
 ```
 
 For [Bazel](https://bazel.build), you can either
 [use Maven](https://github.com/bazelbuild/rules_jvm_external)
 (with the GAVs from above), or use `@io_grpc_grpc_java//api` et al (see below).
 
 [the JARs]:
-https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.78.0
+https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.80.0
 
 Development snapshots are available in [Sonatypes's snapshot
 repository](https://central.sonatype.com/repository/maven-snapshots/).
@@ -123,7 +123,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
       <configuration>
         <protocArtifact>com.google.protobuf:protoc:3.25.8:exe:${os.detected.classifier}</protocArtifact>
         <pluginId>grpc-java</pluginId>
-        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.78.0:exe:${os.detected.classifier}</pluginArtifact>
+        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.80.0:exe:${os.detected.classifier}</pluginArtifact>
       </configuration>
       <executions>
         <execution>
@@ -153,7 +153,7 @@ protobuf {
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.78.0'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.80.0'
     }
   }
   generateProtoTasks {
@@ -186,7 +186,7 @@ protobuf {
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.78.0'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.80.0'
     }
   }
   generateProtoTasks {

SECURITY.md

@@ -399,7 +399,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
 1.71.x-1.74.x      | 4.1.110.Final         | 2.0.70.Final
 1.75.x-1.76.x      | 4.1.124.Final         | 2.0.72.Final
 1.77.x-1.78.x      | 4.1.127.Final         | 2.0.74.Final
-1.79.x-            | 4.1.130.Final         | 2.0.74.Final
+1.79.x-1.80.x      | 4.1.130.Final         | 2.0.74.Final
+1.81.x-            | 4.1.132.Final         | 2.0.75.Final
 
 _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_
 

alts/src/test/java/io/grpc/alts/internal/AltsProtocolNegotiatorTest.java

@@ -202,8 +202,11 @@ public void operationComplete(ChannelFuture future) throws Exception {
     channel.flush();
 
     // Capture the protected data written to the wire.
-    assertEquals(1, channel.outboundMessages().size());
-    ByteBuf protectedData = channel.readOutbound();
+    assertThat(channel.outboundMessages()).isNotEmpty();
+    ByteBuf protectedData = channel.alloc().buffer();
+    while (!channel.outboundMessages().isEmpty()) {
+      protectedData.writeBytes((ByteBuf) channel.readOutbound());
+    }
     assertEquals(message.length(), writeCount.get());
 
     // Read the protected message at the server and verify it matches the original message.
@@ -327,16 +330,18 @@ public void doNotFlushEmptyBuffer() throws Exception {
     String message = "hello";
     ByteBuf in = Unpooled.copiedBuffer(message, UTF_8);
 
-    assertEquals(0, protector.flushes.get());
+    int flushes = protector.flushes.get();
     Future<?> done = channel.write(in);
     channel.flush();
+    flushes++;
     done.get(5, TimeUnit.SECONDS);
-    assertEquals(1, protector.flushes.get());
+    assertEquals(flushes, protector.flushes.get());
 
+    // Flush does not propagate
     done = channel.write(Unpooled.EMPTY_BUFFER);
     channel.flush();
     done.get(5, TimeUnit.SECONDS);
-    assertEquals(1, protector.flushes.get());
+    assertEquals(flushes, protector.flushes.get());
   }
 
   @Test

android-interop-testing/build.gradle

@@ -33,15 +33,11 @@ android {
 
     defaultConfig {
         applicationId "io.grpc.android.integrationtest"
-        // 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
+        minSdkVersion 23
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled = true
     }
     buildTypes {
         debug { minifyEnabled false }
@@ -62,11 +58,11 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'androidx.multidex:multidex:2.0.0'
     implementation libraries.androidx.annotation
     implementation 'com.google.android.gms:play-services-base:18.0.1'
 
     implementation project(':grpc-android'),
+            project(':grpc-api'),
             project(':grpc-core'),
             project(':grpc-census'),
             project(':grpc-okhttp'),
@@ -76,15 +72,16 @@ dependencies {
             libraries.junit,
             libraries.truth,
             libraries.androidx.test.rules,
+            libraries.androidx.test.core,
             libraries.opencensus.contrib.grpc.metrics
 
     implementation (project(':grpc-services')) {
         exclude group: 'com.google.protobuf'
         exclude group: 'com.google.guava'
     }
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3',
-            'androidx.test:runner:1.4.0'
+    androidTestImplementation libraries.androidx.test.ext.junit,
+            libraries.androidx.test.runner
 }
 
 // Checkstyle doesn't run automatically with android
@@ -115,6 +112,25 @@ tasks.withType(JavaCompile).configureEach {
             "|")
 }
 
+// Workaround error seen with Gradle 8.14.3 and AGP 7.4.1 when building:
+//   ./gradlew clean :grpc-android-interop-testing:build -PskipAndroid=false \
+//       -Pandroid.useAndroidX=true --no-build-cache
+//
+// Error message:
+//
+// Execution failed for task ':grpc-android-interop-testing:mergeExtDexDebug'.
+// > Could not resolve all files for configuration ':grpc-android-interop-testing:debugRuntimeClasspath'.
+//    > Failed to transform opencensus-contrib-grpc-metrics-0.31.1.jar (io.opencensus:opencensus-contrib-grpc-metrics:0.31.1) to match attributes {artifactType=android-dex, asm-transformed-variant=NONE, dexing-enable-desugaring=true, dexing-enable-jacoco-instrumentation=false, dexing-is-debuggable=true, dexing-min-sdk=23, org.gradle.category=library, org.gradle.libraryelements=jar, org.gradle.status=release, org.gradle.usage=java-runtime}.
+//       > Could not resolve all files for configuration ':grpc-android-interop-testing:debugRuntimeClasspath'.
+//          > Failed to transform grpc-api-1.81.0-SNAPSHOT.jar (project :grpc-api) to match attributes {artifactType=android-classes-jar, org.gradle.category=library, org.gradle.dependency.bundling=external, org.gradle.jvm.version=8, org.gradle.libraryelements=jar, org.gradle.usage=java-runtime}.
+//             > Execution failed for IdentityTransform: grpc-java/api/build/libs/grpc-api-1.81.0-SNAPSHOT.jar.
+//                > File/directory does not exist: grpc-java/api/build/libs/grpc-api-1.81.0-SNAPSHOT.jar
+tasks.configureEach { task ->
+    if (task.name.equals("mergeExtDexDebug")) {
+        dependsOn(':grpc-api:jar')
+    }
+}
+
 afterEvaluate {
     // Hack to workaround "Task ':grpc-android-interop-testing:extractIncludeDebugProto' uses this
     // output of task ':grpc-context:jar' without declaring an explicit or implicit dependency." The

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

@@ -5,8 +5,7 @@
         android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="io.grpc.android.integrationtest" />
 
-    <application
-        android:name="android.support.multidex.MultiDexApplication" >
+    <application>
     </application>
 
 </manifest>

android-interop-testing/src/androidTest/java/io/grpc/android/integrationtest/UdsChannelInteropTest.java

@@ -19,9 +19,9 @@
 import static org.junit.Assert.assertEquals;
 
 import android.net.LocalSocketAddress.Namespace;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.rule.ActivityTestRule;
+import androidx.test.platform.app.InstrumentationRegistry;
 import io.grpc.Grpc;
 import io.grpc.InsecureServerCredentials;
 import io.grpc.Server;
@@ -60,8 +60,8 @@ public class UdsChannelInteropTest {
   // Ensures Looper is initialized for tests running on API level 15. Otherwise instantiating an
   // AsyncTask throws an exception.
   @Rule
-  public ActivityTestRule<TesterActivity> activityRule =
-      new ActivityTestRule<TesterActivity>(TesterActivity.class);
+  public ActivityScenarioRule<TesterActivity> activityRule =
+      new ActivityScenarioRule<>(TesterActivity.class);
 
   @Before
   public void setUp() throws IOException {

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

@@ -14,8 +14,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/Base.V7.Theme.AppCompat.Light"
-        android:name="androidx.multidex.MultiDexApplication">
+        android:theme="@style/Base.V7.Theme.AppCompat.Light">
         <activity
             android:name=".TesterActivity"
             android:exported="true">

android/build.gradle

@@ -14,7 +14,7 @@ android {
     }
     compileSdkVersion 34
     defaultConfig {
-        minSdkVersion 22
+        minSdkVersion 23
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"