build: upgrade to Gradle 9 and Kotlin 2.2.0

WolfyScript · WolfyScript · commit 2e08a6b473ba · 2025-08-09T15:44:02.000+02:00
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,11 +1,11 @@
 import org.jfrog.gradle.plugin.artifactory.Constant.ALL_PUBLICATIONS
 
 plugins {
-    kotlin("jvm") version "1.9.0"
+    kotlin("jvm") version "2.2.0"
     `java-gradle-plugin`
     `kotlin-dsl`
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version ("8.1.1")
+    id("com.gradleup.shadow") version ("9.0.0")
     id("com.wolfyscript.devtools.java-conventions")
     id("com.jfrog.artifactory")
 }
@@ -26,7 +26,7 @@ tasks.test {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 artifactory {
diff --git a/buildtools/build.gradle.kts b/buildtools/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.9.0"
+    kotlin("jvm") version "2.2.0"
     `java-gradle-plugin`
     `kotlin-dsl`
     `maven-publish`
@@ -23,7 +23,7 @@ tasks.test {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 gradlePlugin {
diff --git a/buildtools/src/main/kotlin/com/wolfyscript/devtools/buildtools/BuildToolsExtension.kt b/buildtools/src/main/kotlin/com/wolfyscript/devtools/buildtools/BuildToolsExtension.kt
@@ -1,13 +1,9 @@
 package com.wolfyscript.devtools.buildtools
 
-import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
-import org.gradle.api.tasks.OutputFile
 
 interface BuildToolsExtension {
 
diff --git a/buildtools/src/main/kotlin/com/wolfyscript/devtools/buildtools/BuildToolsPlugin.kt b/buildtools/src/main/kotlin/com/wolfyscript/devtools/buildtools/BuildToolsPlugin.kt
@@ -13,12 +13,12 @@ class BuildToolsPlugin : Plugin<Project> {
             buildToolsJar.convention(target.objects.fileProperty().convention(buildToolsDir.file("BuildTools.jar")))
         }
 
-        target.tasks.create<BuildToolsUpdateTask>("prepareBuildTools") {
+        target.tasks.register("prepareBuildTools", BuildToolsUpdateTask::class.java) {
             buildToolsJar.convention(extension.buildToolsJar)
             buildToolsDir.convention(extension.buildToolsDir)
         }
 
-        target.tasks.create<BuildToolsInstallTask>("prepareNMS") {
+        target.tasks.register("prepareNMS", BuildToolsInstallTask::class.java) {
             buildToolsDir.convention(extension.buildToolsDir)
             buildToolsJar.convention(extension.buildToolsJar)
             minecraftVersion.convention(extension.minecraftVersion)
diff --git a/buildtools/src/main/kotlin/com/wolfyscript/devtools/buildtools/BuildToolsUpdateTask.kt b/buildtools/src/main/kotlin/com/wolfyscript/devtools/buildtools/BuildToolsUpdateTask.kt
@@ -33,7 +33,7 @@ abstract class BuildToolsUpdateTask : DefaultTask() {
     val buildToolsDir: DirectoryProperty = this.project.objects.directoryProperty().convention(this.project.layout.projectDirectory.dir("buildtools"))
 
     @TaskAction
-    private fun update() {
+    fun update() {
         // Check for existing buildtools
         val buildToolsJar: File = buildToolsJar.get().asFile
         val dir = buildToolsDir.get().asFile
diff --git a/docker-tools/build.gradle.kts b/docker-tools/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.9.0"
+    kotlin("jvm") version "2.2.0"
     `java-gradle-plugin`
     `kotlin-dsl`
     `maven-publish`
@@ -23,7 +23,7 @@ tasks.test {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 gradlePlugin {
diff --git a/docker-tools/src/main/kotlin/com/wolfyscript/devtools/docker/run/DockerRunTask.kt b/docker-tools/src/main/kotlin/com/wolfyscript/devtools/docker/run/DockerRunTask.kt
@@ -15,8 +15,10 @@ import org.gradle.kotlin.dsl.mapProperty
 import org.gradle.kotlin.dsl.property
 import org.gradle.kotlin.dsl.setProperty
 import org.gradle.kotlin.dsl.support.serviceOf
+import org.gradle.process.ExecOperations
+import javax.inject.Inject
 
-abstract class DockerRunTask : DefaultTask() {
+abstract class DockerRunTask @Inject constructor(private var execOperations: ExecOperations): DefaultTask() {
 
     @get:Input
     val name: Property<String> = project.objects.property<String>()
@@ -124,7 +126,8 @@ abstract class DockerRunTask : DefaultTask() {
         }
 
         println(args)
-        project.exec {
+
+        execOperations.exec {
             commandLine(args)
         }
     }
diff --git a/docker-tools/src/main/kotlin/com/wolfyscript/devtools/docker/run/DockerStopTask.kt b/docker-tools/src/main/kotlin/com/wolfyscript/devtools/docker/run/DockerStopTask.kt
@@ -5,8 +5,10 @@ import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.TaskAction
 import org.gradle.kotlin.dsl.property
+import org.gradle.process.ExecOperations
+import javax.inject.Inject
 
-abstract class DockerStopTask: DefaultTask() {
+abstract class DockerStopTask @Inject constructor(private var execOperations: ExecOperations): DefaultTask() {
 
     @get:Input
     val name: Property<String> = project.objects.property<String>()
@@ -23,7 +25,7 @@ abstract class DockerStopTask: DefaultTask() {
     fun stopDockerContainer() {
         val args = listOf("docker", "stop", name.get())
 
-        project.exec {
+        execOperations.exec {
             isIgnoreExitValue = ignoreExitValue.getOrElse(true)
             commandLine(args)
         }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
 rootProject.name = "dev-tools"

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`import org.jfrog.gradle.plugin.artifactory.Constant.ALL_PUBLICATIONS`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- kotlin("jvm") version "1.9.0"`
	`4`	`+ kotlin("jvm") version "2.2.0"`
`5`	`5`	`java-gradle-plugin`
`6`	`6`	`kotlin-dsl`
`7`	`7`	`maven-publish`
`8`		`- id("com.github.johnrengelman.shadow") version ("8.1.1")`
	`8`	`+ id("com.gradleup.shadow") version ("9.0.0")`
`9`	`9`	`id("com.wolfyscript.devtools.java-conventions")`
`10`	`10`	`id("com.jfrog.artifactory")`
`11`	`11`	`}`
`@@ -26,7 +26,7 @@ tasks.test {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`kotlin {`
`29`		`- jvmToolchain(17)`
	`29`	`+ jvmToolchain(21)`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`artifactory {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- kotlin("jvm") version "1.9.0"`
	`2`	`+ kotlin("jvm") version "2.2.0"`
`3`	`3`	`java-gradle-plugin`
`4`	`4`	`kotlin-dsl`
`5`	`5`	`maven-publish`
`@@ -23,7 +23,7 @@ tasks.test {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`kotlin {`
`26`		`- jvmToolchain(17)`
	`26`	`+ jvmToolchain(21)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`gradlePlugin {`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ class BuildToolsPlugin : Plugin<Project> {`
`13`	`13`	`buildToolsJar.convention(target.objects.fileProperty().convention(buildToolsDir.file("BuildTools.jar")))`
`14`	`14`	`}`
`15`	`15`
`16`		`- target.tasks.create<BuildToolsUpdateTask>("prepareBuildTools") {`
	`16`	`+ target.tasks.register("prepareBuildTools", BuildToolsUpdateTask::class.java) {`
`17`	`17`	`buildToolsJar.convention(extension.buildToolsJar)`
`18`	`18`	`buildToolsDir.convention(extension.buildToolsDir)`
`19`	`19`	`}`
`20`	`20`
`21`		`- target.tasks.create<BuildToolsInstallTask>("prepareNMS") {`
	`21`	`+ target.tasks.register("prepareNMS", BuildToolsInstallTask::class.java) {`
`22`	`22`	`buildToolsDir.convention(extension.buildToolsDir)`
`23`	`23`	`buildToolsJar.convention(extension.buildToolsJar)`
`24`	`24`	`minecraftVersion.convention(extension.minecraftVersion)`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,10 @@ import org.gradle.kotlin.dsl.mapProperty`
`15`	`15`	`import org.gradle.kotlin.dsl.property`
`16`	`16`	`import org.gradle.kotlin.dsl.setProperty`
`17`	`17`	`import org.gradle.kotlin.dsl.support.serviceOf`
	`18`	`+import org.gradle.process.ExecOperations`
	`19`	`+import javax.inject.Inject`
`18`	`20`
`19`		`-abstract class DockerRunTask : DefaultTask() {`
	`21`	`+abstract class DockerRunTask @Inject constructor(private var execOperations: ExecOperations): DefaultTask() {`
`20`	`22`
`21`	`23`	`@get:Input`
`22`	`24`	`val name: Property<String> = project.objects.property<String>()`
`@@ -124,7 +126,8 @@ abstract class DockerRunTask : DefaultTask() {`
`124`	`126`	`}`
`125`	`127`
`126`	`128`	`println(args)`
`127`		`- project.exec {`
	`129`	`+`
	`130`	`+ execOperations.exec {`
`128`	`131`	`commandLine(args)`
`129`	`132`	`}`
`130`	`133`	`}`