Gradle deprecations

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

@@ -96,7 +96,7 @@ fun moduleDependencyOrdering(modulesConfig: Configuration): List<String> {
 
     val result = resolvable.resolutionResult
     val allDependencies = result.allDependencies
-    val resolvedDependencies = allDependencies.mapNotNull {
+    allDependencies.mapNotNull {
         if (it is ResolvedDependencyResult) {
             return@mapNotNull it
         }

build-logic/src/main/kotlin/reflections-manifest.gradle.kts

@@ -11,7 +11,7 @@ import java.net.URLClassLoader
 tasks.register("cacheReflections") {
     description = "Caches reflection output to make regular startup faster. May go stale and need cleanup at times."
 
-    val sourceSets = project.convention.getPlugin(JavaPluginConvention::class.java).sourceSets
+    val sourceSets = project.extensions.getByType(SourceSetContainer::class.java)
     val mainSourceSet: SourceSet = sourceSets[SourceSet.MAIN_SOURCE_SET_NAME]
 
     inputs.files(mainSourceSet.output.classesDirs)

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

@@ -29,10 +29,10 @@ apply(from = "$rootDir/config/gradle/publish.gradle")
 // Handle some logic related to where what is
 configure<SourceSetContainer> {
     main {
-        java.destinationDirectory.set(buildDir.resolve("classes"))
+        java.destinationDirectory.set(layout.buildDirectory.dir("classes"))
     }
     test {
-        java.destinationDirectory.set(buildDir.resolve("testClasses"))
+        java.destinationDirectory.set(layout.buildDirectory.dir("testClasses"))
     }
 }
 
@@ -178,8 +178,8 @@ configure<IdeaModel> {
     module {
         // Change around the output a bit
         inheritOutputDirs = false
-        outputDir = buildDir.resolve("classes")
-        testOutputDir = buildDir.resolve("testClasses")
+        outputDir = layout.buildDirectory.dir("classes").get().asFile
+        testOutputDir = layout.buildDirectory.dir("testClasses").get().asFile
         isDownloadSources = true
     }
 }

build.gradle

@@ -41,7 +41,7 @@ plugins {
     // For the "Build and run using: Intellij IDEA | Gradle" switch
     id "org.jetbrains.gradle.plugin.idea-ext" version "1.0"
 
-    id("com.google.protobuf") version "0.8.16" apply false
+    id("com.google.protobuf") version "0.9.4" apply false
     id("terasology-repositories")
 }
 

engine/build.gradle

@@ -195,7 +195,7 @@ sourceSets {
 }
 
 task jmh(type: JavaExec, dependsOn: jmhClasses) {
-    main = 'org.openjdk.jmh.Main'
+    mainClass = 'org.openjdk.jmh.Main'
     classpath = sourceSets.jmh.compileClasspath + sourceSets.jmh.runtimeClasspath
 }
 
@@ -251,7 +251,7 @@ def createVersionInfoFile = tasks.register("createVersionInfoFile", WritePropert
         property("dateTime", startDateTimeString)
     }
 
-    outputFile = "$buildDir/createVersionInfoFile/versionInfo.properties"
+    destinationFile = layout.buildDirectory.dir("createrVersionInfoFile").get().file("versionInfo.properties")
 }
 
 tasks.named("processResources", Copy) {

facades/PC/build.gradle.kts

@@ -168,7 +168,7 @@ val createVersionFile = tasks.register<Copy>("createVersionFile") {
 
     inputs.property("dateTime", startDateTimeString)
     from(templatesDir)
-    into("$buildDir/versionfile")
+    into(layout.buildDirectory.dir("versionfile").get().asFile)
     include(versionFileName)
     expand(mapOf(
         "buildNumber" to env["BUILD_NUMBER"],
@@ -205,7 +205,7 @@ 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))
+                filter(ScriptClasspathRewriter(this, defaultLibraryDirectory, launcherLibraryDirectory) as Transformer<String?, String>)
             }
         }
     })
@@ -248,7 +248,7 @@ 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) : Transformer<String?, String> {
     private val isBatchFile = file.name.endsWith(".bat")
 
     override fun transform(line: String): String = if (isBatchFile) {

subsystems/DiscordRPC/build.gradle.kts

@@ -11,8 +11,8 @@ apply(from = "$rootDir/config/gradle/common.gradle")
 
 configure<SourceSetContainer> {
     // Adjust output path (changed with the Gradle 6 upgrade, this puts it back)
-    main { java.destinationDirectory.set(File("$buildDir/classes")) }
-    test { java.destinationDirectory.set(File("$buildDir/testClasses")) }
+    main { java.destinationDirectory.set(layout.buildDirectory.dir("classes")) }
+    test { java.destinationDirectory.set(layout.buildDirectory.dir("testClasses")) }
 }
 
 dependencies {

subsystems/TypeHandlerLibrary/build.gradle.kts

@@ -14,8 +14,8 @@ version = project(":engine").version
 
 configure<SourceSetContainer> {
     // Adjust output path (changed with the Gradle 6 upgrade, this puts it back)
-    main { java.destinationDirectory.set(File("$buildDir/classes")) }
-    test { java.destinationDirectory.set(File("$buildDir/testClasses")) }
+    main { java.destinationDirectory.set(layout.buildDirectory.dir("classes")) }
+    test { java.destinationDirectory.set(layout.buildDirectory.dir("testClasses")) }
 }
 
 dependencies {

subsystems/build.gradle

@@ -6,8 +6,7 @@ subprojects {
     plugins.apply('java')
     plugins.apply('idea')
 
-    def sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class).sourceSets
-
+    def sourceSets = project.getExtensions().getByType(SourceSetContainer.class)
 
     sourceSets.main.java.destinationDirectory = new File("$buildDir/classes")
     idea {