Skip to content

Commit 3e9af5d

Browse files
committed
chore: bump Gradle to 8.9
1 parent 871aa60 commit 3e9af5d

9 files changed

Lines changed: 51 additions & 27 deletions

File tree

build-logic/basics/src/main/kotlin/build-logic.reproducible-builds.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ tasks.withType<AbstractArchiveTask>().configureEach {
1919
// Ensure builds are reproducible
2020
isPreserveFileTimestamps = false
2121
isReproducibleFileOrder = true
22-
dirMode = "775".toInt(8)
23-
fileMode = "664".toInt(8)
22+
filePermissions {
23+
unix("rw-r--r--")
24+
}
25+
dirPermissions {
26+
unix("rwxr-xr-x")
27+
}
2428
}

build-logic/publishing/src/main/kotlin/build-logic.java-published-library.gradle.kts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,21 @@ java {
2626
withSourcesJar()
2727
}
2828

29-
val archivesBaseName = when (name) {
29+
// We maintain the file names for backward compatibility
30+
val archiveName = when (name) {
3031
"jorphan", "bshclient" -> name
3132
"launcher" -> "ApacheJMeter"
3233
else -> "ApacheJMeter_$name"
3334
}
34-
setProperty("archivesBaseName", archivesBaseName)
35+
36+
base {
37+
archivesName = archiveName
38+
}
3539

3640
publishing {
3741
publications {
3842
create<MavenPublication>("mavenJava") {
39-
artifactId = archivesBaseName
43+
artifactId = archiveName
4044
from(components["java"])
4145
}
4246
}

build-logic/publishing/src/main/kotlin/build-logic.java-published-platform.gradle.kts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@ plugins {
2121
id("build-logic.publish-to-central")
2222
}
2323

24-
val archivesBaseName = "ApacheJMeter_$name"
25-
setProperty("archivesBaseName", archivesBaseName)
24+
val archiveName = "ApacheJMeter_$name"
25+
26+
base {
27+
archivesName = archiveName
28+
}
2629

2730
publishing {
2831
publications {
2932
create<MavenPublication>("mavenJavaPlatform") {
30-
artifactId = archivesBaseName
33+
artifactId = archiveName
3134
from(components["javaPlatform"])
3235
}
3336
}

gradle/wrapper/gradle-wrapper.jar

42 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
20-
distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
21-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
20+
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
21+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
2222
networkTimeout=10000
2323
validateDistributionUrl=true
2424
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/dist-check/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,12 @@ val populateLibs by tasks.registering {
8282
doLast {
8383
val deps = extraTestDependencies.resolvedConfiguration.resolvedArtifacts
8484
with(libOpt) {
85-
fileMode = "644".toInt(8)
86-
dirMode = "755".toInt(8)
85+
filePermissions {
86+
unix("rw-r--r--")
87+
}
88+
dirPermissions {
89+
unix("rwxr-xr-x")
90+
}
8791
from(deps.map { it.file })
8892
}
8993
}

src/dist/build.gradle.kts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,16 @@ val populateLibs by tasks.registering {
132132
val bshclientProject = projects.src.bshclient.dependencyProject.path
133133
val jorphanProject = projects.src.jorphan.dependencyProject.path
134134
listOf(libs, libsExt, binLibs).forEach {
135-
it.fileMode = "644".toInt(8)
136-
it.dirMode = "755".toInt(8)
135+
it.filePermissions {
136+
unix("rw-r--r--")
137+
}
138+
it.dirPermissions {
139+
unix("rwxr-xr-x")
140+
}
137141
}
138142
for (dep in deps) {
139143
val compId = dep.id.componentIdentifier
140-
if (compId !is ProjectComponentIdentifier || !compId.build.isCurrentBuild) {
144+
if (compId !is ProjectComponentIdentifier) {
141145
// Move all non-JMeter jars to lib folder
142146
libs.from(dep.file)
143147
continue

0 commit comments

Comments
 (0)