kotlinforforge 4.12 update for Kotlin 2.2.10

* updated the gradle wrapper to 8.14
* updated Kotlin (and friends) to what fabric-language-kotlin version 1.13.5+kotlin.2.2.10 provides
* fixed `forge/kfflib/src/test/kotlin/thedarkcolour/kfflibtest/InGameTester.kt` (implementing the *sane* API changes from <MinecraftForge/MinecraftForge@90dafb0>)
* ported `forge/kfflib/src/test` to NeoForge
* copied nonmclibs configuration to kfflib (to run the tests)
* overwrote the `org.jetbrains:annotations` version to fix a JPMS module issue where version 13 and 23+ clashed on the classpath
* bumped the version to 4.12.0

Author: bziemons

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 // maven.repo.local is set within the Julia script in the website branch
-tasks.create("publishAllMavens") {
+tasks.register("publishAllMavens") {
     dependsOn(":forge:publishAllMavens")
     dependsOn(":neoforge:publishAllMavens")
 }

buildSrc/src/main/kotlin/kff.combined-conventions.gradle.kts

@@ -18,17 +18,4 @@ project.tasks.withType<Jar> {
             zipTree(project(":neoforge:$subproject").tasks.getByName("jar", Jar::class).archiveFile),
         )
     })
-
-    manifest {
-        attributes(
-            "Specification-Title" to "Kotlin for Forge",
-            "Specification-Vendor" to "Forge",
-            "Specification-Version" to "1",
-            "Implementation-Title" to project.name,
-            "Implementation-Version" to project.version,
-            "Implementation-Vendor" to "thedarkcolour",
-            "Implementation-Timestamp" to LocalDateTime.now(),
-            "Automatic-Module-Name" to "thedarkcolour.kotlinforforge.$subproject",
-        )
-    }
-}
+}

buildSrc/src/main/kotlin/kff.common-conventions.gradle.kts

@@ -1,12 +1,13 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import thedarkcolour.kotlinforforge.plugin.alias
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 import thedarkcolour.kotlinforforge.plugin.getPropertyString
 
-project.plugins.apply(JavaPlugin::class)
-project.plugins.apply(IdeaPlugin::class)
-project.plugins.apply(MavenPublishPlugin::class)
-project.plugins.apply(alias("kotlinJvm", project))
+plugins {
+    java
+    idea
+    `maven-publish`
+    kotlin("jvm")
+}
 
 val jvmTarget = JvmTarget.JVM_17
 
@@ -32,7 +33,7 @@ project.tasks {
             expand(replacements)
         }
     }
-    withType<KotlinCompile> {
+    withType<KotlinJvmCompile> {
         compilerOptions.jvmTarget.set(jvmTarget)
         compilerOptions.freeCompilerArgs.set(listOf("-Xexplicit-api=warning", "-Xjvm-default=all"))
     }

combined/build.gradle.kts

@@ -113,8 +113,8 @@ modrinth {
     loaders.add("neoforge")
     uploadFile.provider(project(":combined").tasks.jarJar)
 }
-tasks.create("publishModPlatforms") {
-    finalizedBy(tasks.create("printPublishingMessage") {
+tasks.register("publishModPlatforms") {
+    finalizedBy(tasks.register("printPublishingMessage") {
         doFirst {
             println("Publishing Kotlin for Forge ${getPropertyString("kff_version")} to Modrinth and CurseForge")
         }

forge/build.gradle.kts

@@ -1,5 +1,4 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import thedarkcolour.kotlinforforge.plugin.getKffMaxVersion
 import thedarkcolour.kotlinforforge.plugin.getPropertyString
 
@@ -106,15 +105,17 @@ tasks {
         }
     }
 
-    withType<KotlinCompile> {
-        compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
-    }
-
     assemble {
         dependsOn(jarJar)
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+    }
+}
+
 publishing {
     publications {
         register<MavenPublication>("maven") {
@@ -126,9 +127,9 @@ publishing {
 }
 
 // maven.repo.local is set within the Julia script in the website branch
-tasks.create("publishAllMavens") {
+tasks.register("publishAllMavens") {
     dependsOn(":forge:publishToMavenLocal")
     dependsOn(":forge:kfflib:publishToMavenLocal")
     dependsOn(":forge:kfflang:publishToMavenLocal")
     dependsOn(":forge:kffmod:publishToMavenLocal")
-}
+}

forge/kfflang/build.gradle.kts

@@ -1,3 +1,4 @@
+import net.minecraftforge.gradle.common.util.RunConfig
 import java.time.LocalDateTime
 
 plugins {
@@ -12,7 +13,7 @@ minecraft {
     copyIdeResources.set(true)
 
     runs {
-        create("client") {
+        create("client", Action<RunConfig> {
             workingDirectory(project.file("run"))
 
             ideaModule = "KotlinForForge.forge.kfflang.test"
@@ -29,7 +30,7 @@ minecraft {
                     source(sourceSets.test.get())
                 }
             }
-        }
+        })
 
         create("server") {
             workingDirectory(project.file("run/server"))

forge/kfflib/build.gradle.kts

@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.time.LocalDateTime
 
 plugins {
@@ -118,10 +117,12 @@ tasks {
             )
         }
     }
+}
 
-    // Only require the lang provider to use explicit visibility modifiers, not the test mod
-    withType<KotlinCompile> {
-        kotlinOptions.freeCompilerArgs = listOf("-Xexplicit-api=warning", "-Xjvm-default=all")
+kotlin {
+    compilerOptions {
+        // Only require the lang provider to use explicit visibility modifiers, not the test mod
+        freeCompilerArgs = listOf("-Xexplicit-api=warning", "-Xjvm-default=all")
     }
 }
 

forge/kfflib/src/test/kotlin/thedarkcolour/kfflibtest/InGameTester.kt

@@ -4,13 +4,13 @@ import net.minecraft.gametest.framework.GameTest
 import net.minecraft.gametest.framework.GameTestAssertException
 import net.minecraft.gametest.framework.GameTestHelper
 import net.minecraft.resources.ResourceLocation
+import net.minecraftforge.gametest.GameTestDontPrefix
 import net.minecraftforge.gametest.GameTestHolder
-import net.minecraftforge.gametest.PrefixGameTestTemplate
 import net.minecraftforge.registries.ForgeRegistries
 
 @GameTestHolder(KFFLibTest.ID)
 public object InGameTester {
-    @PrefixGameTestTemplate(false)
+    @GameTestDontPrefix
     @GameTest(template = "dummy")
     @JvmStatic
     public fun testBlock(helper: GameTestHelper) {
@@ -20,4 +20,4 @@ public object InGameTester {
             }
         }
     }
-}
+}

gradle.properties

@@ -15,4 +15,4 @@ forge_version=49.0.8
 min_neo_version = 20.2.3-beta
 neo_version = 20.4.22-beta
 
-kff_version=4.11.0
+kff_version=4.12.0

gradle/libs.versions.toml

@@ -1,7 +1,8 @@
 [versions]
-kotlin = "2.0.0"
-coroutines = "1.8.1"
-serialization = "1.6.3"
+jba = "23.0.0"
+kotlin = "2.2.10"
+coroutines = "1.10.2"
+serialization = "1.9.0"
 neogradle = "7.0.138"
 neoforge = "20.4.22-beta"
 forgegradle = "6.0.25"
@@ -28,4 +29,4 @@ kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 neogradle = { id = "net.neoforged.gradle.userdev", version.ref = "neogradle" }
 forgegradle = { id = "net.minecraftforge.gradle", version.ref = "forgegradle" }
 minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" }
-cursegradle = { id = "com.matthewprenger.cursegradle", version.ref = "cursegradle" }
+cursegradle = { id = "com.matthewprenger.cursegradle", version.ref = "cursegradle" }