Skip to content

Commit 2aa1227

Browse files
authored
Update to Gradle 9 (#454)
Also bump JDK versions and declare daemon JVM criteria.
1 parent 2cdbfb3 commit 2aa1227

File tree

7 files changed

+23
-8
lines changed

7 files changed

+23
-8
lines changed

.github/actions/build/action.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ runs:
2020
- name: Set up Java
2121
uses: actions/setup-java@v4
2222
with:
23-
distribution: zulu
24-
java-version: 21
23+
distribution: liberica
24+
java-version: |
25+
24
26+
17
2527
- name: Set up Gradle
2628
uses: gradle/actions/setup-gradle@v4
2729
with:

build-logic/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66

77
java {
88
toolchain {
9-
languageVersion = JavaLanguageVersion.of(11)
9+
languageVersion = JavaLanguageVersion.of(17)
1010
vendor = JvmVendorSpec.AZUL
1111
}
1212
}

build-logic/src/main/kotlin/com/gabrielfeo/develocity-api-code-generation.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ openApiGenerate {
4444
.map { it.asFile.absolutePath }
4545
outputDir = generateDir
4646
val ignoreFile = project.layout.projectDirectory.file(".openapi-generator-ignore")
47-
ignoreFileOverride = ignoreFile.asFile.absolutePath
47+
ignoreFileOverride.set(ignoreFile.asFile.absolutePath)
4848
apiPackage = "com.gabrielfeo.develocity.api"
4949
modelPackage = "com.gabrielfeo.develocity.api.model"
5050
packageName = "com.gabrielfeo.develocity.api.internal"

build-logic/src/main/kotlin/com/gabrielfeo/kotlin-jvm-library.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99

1010
java {
1111
toolchain {
12-
languageVersion = JavaLanguageVersion.of(11)
12+
languageVersion = JavaLanguageVersion.of(17)
1313
vendor = JvmVendorSpec.AZUL
1414
}
1515
consistentResolution {

build-logic/src/main/kotlin/com/gabrielfeo/published-kotlin-jvm-library.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tasks.withType<DokkaTask>().configureEach {
2323
dokkaSourceSets.all {
2424
sourceRoot(kotlinSourceRoot)
2525
sourceLink {
26-
localDirectory = kotlinSourceRoot
26+
localDirectory.set(kotlinSourceRoot)
2727
remoteUrl = providers.gradleProperty("repo.url")
2828
.map { URL("$it/blob/$version/${kotlinSourceRoot.relativeTo(rootDir)}") }
2929
remoteLineSuffix = "#L"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/6fb1b1f1c4016d56e240f38e31b0615f/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/bebd8b980a4cdad3dd6f9d1c3f194c08/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/6fb1b1f1c4016d56e240f38e31b0615f/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/bebd8b980a4cdad3dd6f9d1c3f194c08/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/35ea6c5d874634e79bd0dcf2704df0e8/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/bdb01d23d4d09037d47c81bbe1b947e1/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/6fb1b1f1c4016d56e240f38e31b0615f/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/bebd8b980a4cdad3dd6f9d1c3f194c08/redirect
10+
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/fa5701aaf7265fd19b6f642c567a4fbb/redirect
11+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/74794a7f60a73cdd790f439c37c7a608/redirect
12+
toolchainVendor=BELLSOFT
13+
toolchainVersion=24

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)