Skip to content

Commit f5cfed5

Browse files
soloturnclaude
authored andcommitted
build: clear Gradle 10 deprecations, bump wrapper to 9.7.0
gestalt-module/build.gradle.kts used the `val x by tasks.registering(...)` Kotlin DSL delegate syntax, removed in Gradle 10; switched to `val x = tasks.register<Type>(name) { }`. testpack-api/build.gradle set sourceCompatibility/targetCompatibility via the Groovy space-assignment form, also removed in Gradle 10; now uses `=`. Remaining warning (animalsnifferMain's `ReportingExtension.file(String)`) is internal to gradle-animalsniffer-plugin 2.0.1, the latest release; not ours to fix. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
1 parent 815f86a commit f5cfed5

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

gestalt-module/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ tasks.named<JavaCompile>("compileTestJava") {
4242
description = "Provides support for modules - java libraries that can be activated at runtime and run in a sandboxed environment"
4343

4444
// Task registrations
45-
val gatherJarModules by tasks.registering(Copy::class) {
45+
val gatherJarModules = tasks.register<Copy>("gatherJarModules") {
4646
dependsOn(":testpack:moduleA:jar", ":testpack:moduleB:jar", ":testpack:moduleC:jar", ":testpack:moduleD:jar")
4747
from("../testpack/moduleA/build/libs/")
4848
from("../testpack/moduleB/build/libs/")
@@ -52,25 +52,25 @@ val gatherJarModules by tasks.registering(Copy::class) {
5252
include("*.jar")
5353
}
5454

55-
val copyModuleELibs by tasks.registering(Copy::class) {
55+
val copyModuleELibs = tasks.register<Copy>("copyModuleELibs") {
5656
dependsOn(":testpack:moduleA:jar", ":testpack:moduleD:jar")
5757
from("../testpack/moduleA/build/libs")
5858
from("../testpack/moduleD/build/libs")
5959
into("test-modules/moduleE/libs")
6060
include("*.jar")
6161
}
6262

63-
val copyModuleEInfo by tasks.registering(Copy::class) {
63+
val copyModuleEInfo = tasks.register<Copy>("copyModuleEInfo") {
6464
from("../testpack/moduleE")
6565
into("test-modules/moduleE")
6666
include("*.json")
6767
}
6868

69-
val createModuleE by tasks.registering {
69+
val createModuleE = tasks.register("createModuleE") {
7070
dependsOn(":gestalt-module:copyModuleEInfo", ":gestalt-module:copyModuleELibs")
7171
}
7272

73-
val gatherModules by tasks.registering {
73+
val gatherModules = tasks.register("gatherModules") {
7474
dependsOn(":gestalt-module:gatherJarModules", ":gestalt-module:createModuleE")
7575
}
7676

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

testpack/testpack-api/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ dependencies {
88
}
99

1010
tasks.compileJava {
11-
java.sourceCompatibility JavaVersion.VERSION_17
12-
java.targetCompatibility JavaVersion.VERSION_17
11+
java.sourceCompatibility = JavaVersion.VERSION_17
12+
java.targetCompatibility = JavaVersion.VERSION_17
1313
}

0 commit comments

Comments
 (0)