From 619ad616d3888b4e3bc9a1101050bc84eb79dfb6 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@engflow.com>
Date: Fri, 5 Dec 2025 16:40:34 -0800
Subject: [PATCH] add Java 25 to testing matrix

---
 .github/workflows/testing.yml                                   | 2 +-
 buildSrc/src/main/java/io/grpc/gradle/CheckForUpdatesTask.java  | 1 +
 .../src/main/java/io/grpc/gradle/CheckPackageLeakageTask.java   | 1 +
 .../java/io/grpc/gradle/RequireUpperBoundDepsMatchTask.java     | 1 +
 gradle/wrapper/gradle-wrapper.properties                        | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 4fe75b0be78..265e57be977 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jre: [8, 11, 17, 21]
+        jre: [8, 11, 17, 21, 25]
       fail-fast: false # Should swap to true if we grow a large matrix
 
     steps:
diff --git a/buildSrc/src/main/java/io/grpc/gradle/CheckForUpdatesTask.java b/buildSrc/src/main/java/io/grpc/gradle/CheckForUpdatesTask.java
index b7c28dbbb2d..fd8375f97b4 100644
--- a/buildSrc/src/main/java/io/grpc/gradle/CheckForUpdatesTask.java
+++ b/buildSrc/src/main/java/io/grpc/gradle/CheckForUpdatesTask.java
@@ -49,6 +49,7 @@
 public abstract class CheckForUpdatesTask extends DefaultTask {
   private final Set<Library> libraries;
 
+  @SuppressWarnings("this-escape", "deprecation")
   @Inject
   public CheckForUpdatesTask(Configuration updateConf, String catalog, RegularFile commentFile)
       throws IOException {
diff --git a/buildSrc/src/main/java/io/grpc/gradle/CheckPackageLeakageTask.java b/buildSrc/src/main/java/io/grpc/gradle/CheckPackageLeakageTask.java
index 1a3cf1fe0b6..a97cdcb879b 100644
--- a/buildSrc/src/main/java/io/grpc/gradle/CheckPackageLeakageTask.java
+++ b/buildSrc/src/main/java/io/grpc/gradle/CheckPackageLeakageTask.java
@@ -31,6 +31,7 @@
 
 /** Verifies all class files within jar files are in a specified Java package. */
 public abstract class CheckPackageLeakageTask extends DefaultTask {
+  @SuppressWarnings("this-escape")
   public CheckPackageLeakageTask() {
     // Fake output for UP-TO-DATE checking
     getOutputs().file(getProject().getLayout().getBuildDirectory().file("tmp/" + getName()));
diff --git a/buildSrc/src/main/java/io/grpc/gradle/RequireUpperBoundDepsMatchTask.java b/buildSrc/src/main/java/io/grpc/gradle/RequireUpperBoundDepsMatchTask.java
index 80d8f7bcb14..c9decef5e8a 100644
--- a/buildSrc/src/main/java/io/grpc/gradle/RequireUpperBoundDepsMatchTask.java
+++ b/buildSrc/src/main/java/io/grpc/gradle/RequireUpperBoundDepsMatchTask.java
@@ -46,6 +46,7 @@ public abstract class RequireUpperBoundDepsMatchTask extends DefaultTask {
   private final String projectPath;
   private final String projectVersion;
 
+  @SuppressWarnings("this-escape")
   public RequireUpperBoundDepsMatchTask() {
     projectPath = getProject().getPath();
     projectVersion = getProject().getVersion().toString();
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d4081da476b..23449a2b543 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME