Skip to content

Gradle 9 #4614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
trask wants to merge 1 commit into from
+7 −7
Closed

Gradle 9 #4614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ plugins {
`java-library`
}

val sdkVersionDir = "${buildDir}/generated/resources/sdk-version"
val sdkVersionDir = layout.buildDirectory.dir("generated/resources/sdk-version")

tasks {
register("generateVersionResource") {
inputs.property("project.version", project.version.toString())
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}")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion smoke-tests/apps/gRPC/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading