From 77d85b71ccfc8ee4fa8e74d213d67bd74f2821b9 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Fri, 6 Feb 2026 07:23:26 -0800
Subject: [PATCH] Gradle 9

---
 buildSrc/build.gradle.kts                                     | 4 ++--
 .../src/main/kotlin/ai.javaagent-instrumentation.gradle.kts   | 2 +-
 buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts       | 4 ++--
 gradle/wrapper/gradle-wrapper.properties                      | 2 +-
 smoke-tests/apps/gRPC/build.gradle.kts                        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 8d45a8da86b..3fa59528b66 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -44,6 +44,6 @@ dependencies {
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
 
-  // earlier versions aren't compatible with Gradle 8.1.1
-  implementation("org.springframework.boot:spring-boot-gradle-plugin:2.5.12")
+  // Spring Boot 3.4.x gradle plugin supports Gradle 9 while still building Spring Boot 2.x apps
+  implementation("org.springframework.boot:spring-boot-gradle-plugin:3.4.2")
 }
diff --git a/buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts b/buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts
index 286d4cf0c9d..6d4c4b73ad3 100644
--- a/buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts
+++ b/buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts
@@ -62,7 +62,7 @@ tasks.withType<Test>().configureEach {
   // The sources are packaged into the testing jar so we need to make sure to exclude from the test
   // classpath, which automatically inherits them, to ensure our shaded versions are used.
   classpath = classpath.filter {
-    if (file("$buildDir/resources/main") == it || file("$buildDir/classes/java/main") == it) {
+    if (layout.buildDirectory.dir("resources/main").get().asFile == it || layout.buildDirectory.dir("classes/java/main").get().asFile == it) {
       return@filter false
     }
     return@filter true
diff --git a/buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts b/buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts
index 44891ad2385..ebc46581b45 100644
--- a/buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts
+++ b/buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts
@@ -2,7 +2,7 @@ plugins {
   `java-library`
 }
 
-val sdkVersionDir = "${buildDir}/generated/resources/sdk-version"
+val sdkVersionDir = layout.buildDirectory.dir("generated/resources/sdk-version")
 
 tasks {
   register("generateVersionResource") {
@@ -10,7 +10,7 @@ tasks {
     outputs.dir(sdkVersionDir)
 
     doLast {
-      File(sdkVersionDir, "ai.sdk-version.properties").writeText("version=${project.version}")
+      sdkVersionDir.get().file("ai.sdk-version.properties").asFile.writeText("version=${project.version}")
     }
   }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d4081da476b..37f78a6af83 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.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/smoke-tests/apps/gRPC/build.gradle.kts b/smoke-tests/apps/gRPC/build.gradle.kts
index eae03a2ecef..d3c38c0cfe1 100644
--- a/smoke-tests/apps/gRPC/build.gradle.kts
+++ b/smoke-tests/apps/gRPC/build.gradle.kts
@@ -2,7 +2,7 @@ import com.google.protobuf.gradle.*
 
 plugins {
   id("ai.smoke-test-jar")
-  id("com.google.protobuf") version "0.8.19"
+  id("com.google.protobuf") version "0.9.4"
 }
 
 val grpcVersion = "1.26.0" // first version with support for arm64