update tooling for 1.18

buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt

@@ -21,8 +21,8 @@ fun Project.configureCompilation() {
     apply(plugin = "idea")
     
     configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_16
-        targetCompatibility = JavaVersion.VERSION_16
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     
     tasks.withType<JavaCompile> {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 org.gradle.jvmargs=-Xmx4096m

platforms/fabric/build.gradle.kts

@@ -1,11 +1,10 @@
 import com.dfsek.terra.addonDir
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.modrinth.minotaur.TaskModrinthUpload
-import net.fabricmc.loom.LoomGradleExtension
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id("fabric-loom").version("0.8-SNAPSHOT")
+    id("fabric-loom").version("0.10-SNAPSHOT")
     id("com.modrinth.minotaur").version("1.1.0")
 }
 
@@ -17,13 +16,17 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("org.yaml", "com.dfsek.terra.lib.yaml")
 }
 
+val minecraft = "1.18-pre1"
+val yarn = "4:v2"
+val fabricLoader = "0.12.5"
+
 
 dependencies {
     "shadedApi"(project(":common:implementation"))
     
-    "minecraft"("com.mojang:minecraft:1.17.1")
-    "mappings"("net.fabricmc:yarn:1.17.1+build.1:v2")
-    "modImplementation"("net.fabricmc:fabric-loader:0.11.3")
+    "minecraft"("com.mojang:minecraft:$minecraft")
+    "mappings"("net.fabricmc:yarn:$minecraft+build.$yarn")
+    "modImplementation"("net.fabricmc:fabric-loader:$fabricLoader")
     
     "modCompileOnly"("com.sk89q.worldedit:worldedit-fabric-mc1.16:7.2.0-SNAPSHOT") {
         exclude(group = "com.google.guava", module = "guava")
@@ -34,14 +37,12 @@ dependencies {
     }
 }
 
-tasks.named<ShadowJar>("shadowJar") {
-    relocate("org.json", "com.dfsek.terra.lib.json")
-    relocate("org.yaml", "com.dfsek.terra.lib.yaml")
+tasks.withType<JavaCompile>().configureEach {
+    options.release.set(17)
 }
 
-
-configure<LoomGradleExtension> {
-    accessWidener("src/main/resources/terra.accesswidener")
+loom {
+    accessWidener = file("src/main/resources/terra.accesswidener")
     refmapName = "terra-refmap.json"
 }
 
@@ -56,6 +57,8 @@ val remapped = tasks.register<RemapJarTask>("remapShadedJar") {
 }
 
 
+
+
 tasks.register<TaskModrinthUpload>("publishModrinthFabric") {
     dependsOn("remapShadedJar")
     group = "fabric"

platforms/fabric/src/main/resources/terra.mixins.json

@@ -2,7 +2,7 @@
     "required":           true,
     "minVersion":         "0.8",
     "package":            "com.dfsek.terra.fabric.mixin",
-    "compatibilityLevel": "JAVA_16",
+    "compatibilityLevel": "JAVA_17",
     "mixins":             [
         "CommandManagerMixin",
         "ServerWorldMixin",

platforms/sponge/build.gradle.kts

@@ -8,11 +8,6 @@ repositories {
     }
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_16
-    targetCompatibility = JavaVersion.VERSION_16
-}
-
 dependencies {
     "shadedApi"(project(":common:implementation"))
     "annotationProcessor"("org.spongepowered:spongeapi:9.0.0-SNAPSHOT")