build: bump wrapper to Gradle 9.7.0, clear the blockers and deprecations

Gradle 9.7.0 ships Kotlin 2.4, which enforces Transformer's declared
OUT : Any bound. ContentFilterable.filter takes Transformer<String?,
String> - the OUT is nullable because returning null there drops the
line - so naming that type is now a compile error (KTLC-358), and
facades/PC named it twice: implementing the interface, and casting to
it. The net effect is that Gradle's own API is not implementable from
the Kotlin that Gradle ships with. Passing a lambda instead lets SAM
conversion supply the type argument, so the script never names it;
ScriptClasspathRewriter keeps its logic and never returned null anyway.

That was a prerequisite for the bump rather than a consequence of it: on
9.6.1 Kotlin only warns ("will become an error in language version 2.5"),
so the script had to stop naming the type before the wrapper could move.
Anyone already running a system Gradle 9.7.0 could not configure this
build at all.

Only the distributionUrl moves. The wrapper jar and gradlew scripts are
left alone - they are just the bootstrapper, and the existing ones drive
9.7.0 fine, so regenerating them would be diff noise. Staying on -bin
too: the wrapper task would have switched it to -all, making every CI run
additionally download sources and docs.

Also clears the Gradle 10 deprecations this repo owns - 100 warnings
before, 39 after:

- modules/build.gradle.kts passed the Project object itself to api(),
  once per subproject. Using a Project as dependency notation fails with
  an error in Gradle 10; it now depends on project(path).

- GradleDependencyInfo.asMap() produced the group:/name:/version: map
  form, which terasology-module.gradle.kts applies to every module.
  Multi-string notation also fails in Gradle 10, so it now produces
  single-string "group:module:version". Version ranges are unaffected -
  they contain no colons, so the coordinate still splits unambiguously.

- config/gradle/publish.gradle read publishRepo/mavenUser/mavenPass as
  bare names, an implicit lookup in a parent project. Those sit inside
  hasProperty guards, so they would have broken publishing, not building.

Every remaining warning traces into libs/gestalt or libs/TeraNUI, which
are independent repos reached through includeBuild and need their own
PRs. The module-attributed ones were never the module repos' fault:
every modules/*/build.gradle is byte-identical to templates/build.gradle
and only applies terasology-module, so those were this repo's
build-logic reported once per project.

Not addressed: the protoc coordinate warning attributed to :engine comes
from protobuf-gradle-plugin 0.9.4's own ToolsLocator, which tokenizes the
single-string coordinate we give it and rebuilds it as a map.
engine/build.gradle.kts is already correct; that needs a plugin upgrade.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Author: soloturn

build-logic/src/main/kotlin/org/terasology/gradology/module_build.kt

@@ -16,9 +16,7 @@ import java.io.File
 // or something else from gradle.api.artifacts, but it exposes no concrete implementation
 // of those interfaces.
 data class GradleDependencyInfo(val group: String, val module: String, val version: String) {
-    fun asMap(): Map<String, String> {
-        return mapOf("group" to group, "name" to module, "version" to version)
-    }
+    fun asNotation(): String = "$group:$module:$version"
 }
 
 

build-logic/src/main/kotlin/terasology-module.gradle.kts

@@ -61,12 +61,12 @@ dependencies {
         if (optional) {
             // `optional` module dependencies are ones it does not require for runtime
             // (but will use opportunistically if available)
-            compileOnly(gradleDep.asMap())
+            compileOnly(gradleDep.asNotation())
             // though modules also sometimes use "optional" to describe their test dependencies;
             // they're not required for runtime, but they *are* required for tests.
-            testImplementation(gradleDep.asMap())
+            testImplementation(gradleDep.asNotation())
         } else {
-            implementation(gradleDep.asMap())
+            implementation(gradleDep.asNotation())
         }
     }
 

config/gradle/publish.gradle

@@ -14,8 +14,9 @@ publishing {
 
             if (rootProject.hasProperty("publishRepo")) {
                 // This first option is good for local testing, you can set a full explicit target repo in gradle.properties
-                url = "https://artifactory.terasology.io/artifactory/$publishRepo"
-                logger.info("Changing PUBLISH repoKey set via Gradle property to {}", publishRepo)
+                String explicitPublishRepo = rootProject.property("publishRepo")
+                url = "https://artifactory.terasology.io/artifactory/$explicitPublishRepo"
+                logger.info("Changing PUBLISH repoKey set via Gradle property to {}", explicitPublishRepo)
             } else {
                 // Support override from the environment to use a different target publish org
                 String deducedPublishRepo = System.getenv()["PUBLISH_ORG"]
@@ -43,8 +44,8 @@ publishing {
 
             if (rootProject.hasProperty("mavenUser") && rootProject.hasProperty("mavenPass")) {
                 credentials {
-                    username = "$mavenUser"
-                    password = "$mavenPass"
+                    username = rootProject.property("mavenUser")
+                    password = rootProject.property("mavenPass")
                 }
                 authentication {
                     basic(BasicAuthentication)

facades/PC/build.gradle.kts

@@ -199,7 +199,8 @@ val distForLauncher = tasks.register<Zip>("distForLauncher") {
             if (this.sourcePath == "Terasology" || this.sourcePath == "Terasology.bat") {
                 // I don't know how the "lib/" makes its way in to the classpath used by CreateStartScripts,
                 // so we're adjusting it after-the-fact.
-                filter(ScriptClasspathRewriter(this, defaultLibraryDirectory, launcherLibraryDirectory) as Transformer<String?, String>)
+                val rewriter = ScriptClasspathRewriter(this, defaultLibraryDirectory, launcherLibraryDirectory)
+                filter { line -> rewriter.rewrite(line) }
             }
         }
     })
@@ -242,10 +243,10 @@ tasks.register<Task>("testDist") {
     dependsOn("testDistForLauncher", "testDistZip")
 }
 
-class ScriptClasspathRewriter(file: FileCopyDetails, val oldDirectory: String, val newDirectory: String) : Transformer<String?, String> {
+class ScriptClasspathRewriter(file: FileCopyDetails, val oldDirectory: String, val newDirectory: String) {
     private val isBatchFile = file.name.endsWith(".bat")
 
-    override fun transform(line: String): String = if (isBatchFile) {
+    fun rewrite(line: String): String = if (isBatchFile) {
             line.replace("$oldDirectory\\", "$newDirectory\\")
         } else {
             line.replace("$oldDirectory/", "$newDirectory/")

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

modules/build.gradle.kts

@@ -21,8 +21,8 @@ javaPlatform {
 
 dependencies {
     // This platform depends on each of its subprojects.
-    subprojects {
-        api(this)
+    subprojects.forEach {
+        api(project(it.path))
     }
 }