Updated gradle compilation config

WillFP · WillFP · commit 2158be40cd12 · 2024-12-05T16:29:08.000Z
diff --git a/eco-core/core-backend-modern/build.gradle.kts b/eco-core/core-backend-modern/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 group = "com.willfp"
 version = rootProject.version
 
@@ -12,8 +14,8 @@ tasks {
     }
 
     compileKotlin {
-        kotlinOptions {
-            jvmTarget = "21"
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_21)
         }
     }
 }
diff --git a/eco-core/core-backend/build.gradle.kts b/eco-core/core-backend/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 group = "com.willfp"
 version = rootProject.version
 
@@ -20,8 +22,8 @@ tasks {
     }
 
     compileKotlin {
-        kotlinOptions {
-            jvmTarget = "17"
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
 }
diff --git a/eco-core/core-nms/modern/build.gradle.kts b/eco-core/core-nms/modern/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("io.papermc.paperweight.userdev")
 }
@@ -16,8 +18,8 @@ tasks {
     }
 
     compileKotlin {
-        kotlinOptions {
-            jvmTarget = "21"
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_21)
         }
     }
 }
diff --git a/eco-core/core-nms/v1_21/build.gradle.kts b/eco-core/core-nms/v1_21/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("io.papermc.paperweight.userdev")
 }
@@ -43,8 +45,8 @@ tasks {
     }
 
     compileKotlin {
-        kotlinOptions {
-            jvmTarget = "21"
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_21)
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1,2 @@
 version = 6.74.4
+kotlin.daemon.jvmargs=-Xmx2g -XX:+UseG1GC -XX:MaxMetaspaceSize=512m

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
	`2`	`+`
`1`	`3`	`group = "com.willfp"`
`2`	`4`	`version = rootProject.version`
`3`	`5`
`@@ -12,8 +14,8 @@ tasks {`
`12`	`14`	`}`
`13`	`15`
`14`	`16`	`compileKotlin {`
`15`		`- kotlinOptions {`
`16`		`- jvmTarget = "21"`
	`17`	`+ compilerOptions {`
	`18`	`+ jvmTarget.set(JvmTarget.JVM_21)`
`17`	`19`	`}`
`18`	`20`	`}`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
	`2`	`+`
`1`	`3`	`plugins {`
`2`	`4`	`id("io.papermc.paperweight.userdev")`
`3`	`5`	`}`
`@@ -16,8 +18,8 @@ tasks {`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`compileKotlin {`
`19`		`- kotlinOptions {`
`20`		`- jvmTarget = "21"`
	`21`	`+ compilerOptions {`
	`22`	`+ jvmTarget.set(JvmTarget.JVM_21)`
`21`	`23`	`}`
`22`	`24`	`}`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`version = 6.74.4`
	`2`	`+kotlin.daemon.jvmargs=-Xmx2g -XX:+UseG1GC -XX:MaxMetaspaceSize=512m`