Merge remote-tracking branch 'upstream/master' into lb-policy-delay

# Conflicts:
#	core/src/main/java/io/grpc/internal/PickFirstLeafLoadBalancer.java

Author: AgraVator

.bazelrc

@@ -1 +1,3 @@
 build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
+
+common:skip_android --deleted_packages=android,binder

.github/workflows/branch-testing.yml

@@ -20,14 +20,14 @@ jobs:
       fail-fast: false # Should swap to true if we grow a large matrix
 
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
+    - uses: actions/checkout@v6
+    - uses: actions/setup-java@v5
       with:
         java-version: ${{ matrix.jre }}
         distribution: 'temurin'
 
     - name: Gradle cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           ~/.gradle/caches

.github/workflows/gradle-wrapper-validation.yml

@@ -9,5 +9,5 @@ jobs:
     name: "Gradle wrapper validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: gradle/actions/wrapper-validation@v4
+      - uses: actions/checkout@v6
+      - uses: gradle/actions/wrapper-validation@v6

.github/workflows/lock.yml

@@ -13,7 +13,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: dessant/lock-threads@v6
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: 90

.github/workflows/testing.yml

@@ -21,14 +21,14 @@ jobs:
       fail-fast: false # Should swap to true if we grow a large matrix
 
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
+    - uses: actions/checkout@v6
+    - uses: actions/setup-java@v5
       with:
         java-version: ${{ matrix.jre }}
         distribution: 'temurin'
 
     - name: Gradle cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           ~/.gradle/caches
@@ -37,7 +37,7 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-gradle-
     - name: Maven cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           ~/.m2/repository
@@ -46,7 +46,7 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Protobuf cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: /tmp/protobuf-cache
         key: ${{ runner.os }}-maven-${{ hashFiles('buildscripts/make_dependencies.sh') }}
@@ -55,7 +55,7 @@ jobs:
       run: buildscripts/kokoro/unix.sh
     - name: Post Failure Upload Test Reports to Artifacts
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: Test Reports (JRE ${{ matrix.jre }})
         path: |
@@ -71,7 +71,7 @@ jobs:
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
       run: ./gradlew :grpc-all:coveralls -PskipAndroid=true -x compileJava
     - name: Codecov
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v6
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -80,31 +80,35 @@ jobs:
     strategy:
       matrix:
         bzlmod: [true, false]
+        bazel_version: [8.7.0, 9.1.0]
+        exclude:
+          - bazel_version: 9.1.0
+            bzlmod: false
     env:
-      USE_BAZEL_VERSION: 7.7.1
+      USE_BAZEL_VERSION: ${{ matrix.bazel_version }}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: Check versions match in MODULE.bazel and repositories.bzl
       run: |
         diff -u <(sed -n '/GRPC_DEPS_START/,/GRPC_DEPS_END/ {/GRPC_DEPS_/! p}' MODULE.bazel) \
                 <(sed -n '/GRPC_DEPS_START/,/GRPC_DEPS_END/ {/GRPC_DEPS_/! p}' repositories.bzl)
 
     - name: Bazel cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           ~/.cache/bazel/*/cache
           ~/.cache/bazelisk/downloads
         key: ${{ runner.os }}-bazel-${{ env.USE_BAZEL_VERSION }}-${{ hashFiles('WORKSPACE', 'repositories.bzl') }}
 
     - name: Run bazel build
-      run: bazelisk build //... --enable_bzlmod=${{ matrix.bzlmod }}
+      run: bazelisk build //... --config=skip_android --enable_bzlmod=${{ matrix.bzlmod }} --enable_workspace=${{ !matrix.bzlmod }}
 
     - name: Run bazel test
-      run: bazelisk test //... --enable_bzlmod=${{ matrix.bzlmod }}
+      run: bazelisk test //... --config=skip_android --enable_bzlmod=${{ matrix.bzlmod }} --enable_workspace=${{ !matrix.bzlmod }}
 
     - name: Run example bazel build
-      run: bazelisk build //... --enable_bzlmod=${{ matrix.bzlmod }}
+      run: bazelisk build //... --enable_bzlmod=${{ matrix.bzlmod }} --enable_workspace=${{ !matrix.bzlmod }}
       working-directory: ./examples

COMPILING.md

@@ -150,3 +150,26 @@ $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses
 
 # Add 'export ANDROID_HOME=$HOME/Android/Sdk' to your .bashrc or equivalent
 ```
+
+Building with Bazel
+===================
+
+grpc-java can also be built using [Bazel](https://bazel.build/). We support
+the two most recent major versions of Bazel.
+[Install bazelisk](https://github.com/bazelbuild/bazelisk#installation)
+to ensure you're always building using the latest supported version, then try:
+
+```
+$ bazelisk build //...
+```
+
+Some parts of grpc-java depend on Android. Bazel can build these parts too but,
+for size, licensing and maintenance reasons, it requires a locally installed
+Android SDK. If you don't have the SDK and/or don't care about Android, use the
+`skip_android` configuration to skip building the Android parts:
+
+```sh
+$ bazelisk build //... --config=skip_android
+```
+
+You cannot run the tests from Bazel at this time.

MODULE.bazel

@@ -1,7 +1,6 @@
 module(
     name = "grpc-java",
-    version = "1.82.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
-    compatibility_level = 0,
+    version = "1.83.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
     repo_name = "io_grpc_grpc_java",
 )
 
@@ -14,29 +13,32 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "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.13.2",
-    "com.google.errorprone:error_prone_annotations:2.48.0",
+    "com.google.code.gson:gson:2.14.0",
+    "com.google.errorprone:error_prone_annotations:2.50.0",
     "com.google.guava:failureaccess:1.0.1",
-    "com.google.guava:guava:33.5.0-android",
+    "com.google.guava:guava:33.6.0-android",
     "com.google.re2j:re2j:1.8",
     "com.google.s2a.proto.v2:s2a-proto:0.1.3",
     "com.google.truth:truth:1.4.5",
+    "dev.cel:runtime:0.13.0",
+    "dev.cel:protobuf:0.13.0",
+    "dev.cel:common:0.13.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.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-buffer:4.2.15.Final",
+    "io.netty:netty-codec-base:4.2.15.Final",
+    "io.netty:netty-codec-http2:4.2.15.Final",
+    "io.netty:netty-codec-http:4.2.15.Final",
+    "io.netty:netty-codec-socks:4.2.15.Final",
+    "io.netty:netty-common:4.2.15.Final",
+    "io.netty:netty-handler-proxy:4.2.15.Final",
+    "io.netty:netty-handler:4.2.15.Final",
+    "io.netty:netty-resolver:4.2.15.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.netty:netty-transport-native-epoll:jar:linux-x86_64:4.2.15.Final",
+    "io.netty:netty-transport-native-unix-common:4.2.15.Final",
+    "io.netty:netty-transport:4.2.15.Final",
     "io.opencensus:opencensus-api:0.31.0",
     "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
     "io.perfmark:perfmark-api:0.27.0",
@@ -50,13 +52,22 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
 bazel_dep(name = "abseil-cpp", version = "20250512.1")
 bazel_dep(name = "bazel_jar_jar", version = "0.1.11.bcr.1")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5", repo_name = "com_google_googleapis")
+bazel_dep(name = "googleapis", version = "0.0.0-20260514-1dbb1a14", repo_name = "com_google_googleapis")
 bazel_dep(name = "grpc-proto", version = "0.0.0-20240627-ec30f58.bcr.1", repo_name = "io_grpc_grpc_proto")
 bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")
+bazel_dep(name = "rules_android", version = "0.7.2")
 bazel_dep(name = "rules_cc", version = "0.0.9")
 bazel_dep(name = "rules_java", version = "9.1.0")
 bazel_dep(name = "rules_jvm_external", version = "6.0")
 
+android_sdk_repository_extension = use_extension(
+    "@rules_android//rules/android_sdk_repository:rule.bzl",
+    "android_sdk_repository_extension",
+)
+use_repo(android_sdk_repository_extension, "androidsdk")
+
+register_toolchains("@androidsdk//:sdk-toolchain", "@androidsdk//:all")
+
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
     artifacts = IO_GRPC_GRPC_JAVA_ARTIFACTS,
@@ -67,6 +78,30 @@ maven.install(
 )
 use_repo(maven, "maven")
 
+# Define a separate, dev-only extension import for Android deps.
+# This prevents downstream non-Android users from having to resolve
+# Google Maven (which is required for androidx.*) or rules_android transitively.
+grpc_android_maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven", dev_dependency = True)
+grpc_android_maven.install(
+    name = "grpc_android_maven",
+    # Set this explicitly since the default guess is incorrect under Bzlmod.
+    aar_import_bzl_label = "@rules_android//rules:rules.bzl",
+    artifacts = [
+        "androidx.annotation:annotation:1.6.0",
+        "androidx.annotation:annotation-jvm:1.6.0",
+        "androidx.core:core:1.13.1",
+        "androidx.lifecycle:lifecycle-common:2.6.2",
+    ],
+    repositories = [
+        "https://repo.maven.apache.org/maven2/",
+        "https://maven.google.com",
+    ],
+    strict_visibility = True,
+    # For Bazel 8+ compatibility.
+    use_starlark_android_rules = True,
+)
+use_repo(grpc_android_maven, "grpc_android_maven")
+
 maven.override(
     coordinates = "com.google.protobuf:protobuf-java",
     target = "@com_google_protobuf//:protobuf_java",

README.md

@@ -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.81.0/examples) and the
-[Android example](https://github.com/grpc/grpc-java/tree/v1.81.0/examples/android)
+The [examples](https://github.com/grpc/grpc-java/tree/v1.82.0/examples) and the
+[Android example](https://github.com/grpc/grpc-java/tree/v1.82.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.81.0</version>
+  <version>1.82.0</version>
   <scope>runtime</scope>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-protobuf</artifactId>
-  <version>1.81.0</version>
+  <version>1.82.0</version>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-stub</artifactId>
-  <version>1.81.0</version>
+  <version>1.82.0</version>
 </dependency>
 ```
 
 Or for Gradle with non-Android, add to your dependencies:
 ```gradle
-runtimeOnly 'io.grpc:grpc-netty-shaded:1.81.0'
-implementation 'io.grpc:grpc-protobuf:1.81.0'
-implementation 'io.grpc:grpc-stub:1.81.0'
+runtimeOnly 'io.grpc:grpc-netty-shaded:1.82.0'
+implementation 'io.grpc:grpc-protobuf:1.82.0'
+implementation 'io.grpc:grpc-stub:1.82.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.81.0'
-implementation 'io.grpc:grpc-protobuf-lite:1.81.0'
-implementation 'io.grpc:grpc-stub:1.81.0'
+implementation 'io.grpc:grpc-okhttp:1.82.0'
+implementation 'io.grpc:grpc-protobuf-lite:1.82.0'
+implementation 'io.grpc:grpc-stub:1.82.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.81.0
+https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.82.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.81.0:exe:${os.detected.classifier}</pluginArtifact>
+        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.82.0:exe:${os.detected.classifier}</pluginArtifact>
       </configuration>
       <executions>
         <execution>
@@ -153,7 +153,7 @@ protobuf {
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.81.0'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.82.0'
     }
   }
   generateProtoTasks {
@@ -186,7 +186,7 @@ protobuf {
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.81.0'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.82.0'
     }
   }
   generateProtoTasks {

RELEASING.md

@@ -250,3 +250,7 @@ gRPC for things that will need a migration effort.
 When happy with the dependency upgrades, update the versions in `MODULE.bazel`,
 `repositories.bzl`, and the various `pom.xml` and `build.gradle` files in
 `examples/`.
+
+Upgrade the `uses:` for actions in `.github/workflows` to newer versions. Make
+sure to see what changed in each new major version, but it is most often just
+requiring a newer Node.js version.

alts/BUILD.bazel

@@ -22,7 +22,7 @@ java_library(
         artifact("com.google.errorprone:error_prone_annotations"),
         artifact("com.google.guava:guava"),
         artifact("io.netty:netty-buffer"),
-        artifact("io.netty:netty-codec"),
+        artifact("io.netty:netty-codec-base"),
         artifact("io.netty:netty-common"),
         artifact("io.netty:netty-handler"),
         artifact("io.netty:netty-transport"),