update scripts to kotlin 2.0

rhysdh540 · May 21, 2024 · 0896649 · 0896649
1 parent ab0299d
commit 0896649
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+
 plugins {
 	`kotlin-dsl`
 }
@@ -16,6 +18,10 @@ fun DependencyHandler.plugin(id: String, version: String) {
 	this.implementation(group = id, name = "$id.gradle.plugin", version = version)
 }
 
+tasks.compileKotlin {
+	compilerOptions.languageVersion.set(KotlinVersion.KOTLIN_2_0)
+}
+
 dependencies {
 	plugin("architectury-plugin", "3.4.155")
 	plugin("dev.architectury.loom", "1.5.391")

diff --git a/buildSrc/src/main/kotlin/PlatformPlugin.kt b/buildSrc/src/main/kotlin/PlatformPlugin.kt
@@ -7,7 +7,6 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ModuleDependency
 import org.gradle.api.component.AdhocComponentWithVariants
-import org.gradle.api.file.RegularFileProperty
 import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.*
@@ -20,7 +19,9 @@ class PlatformPlugin : Plugin<Project> {
 
 			afterEvaluate {
 				loom.runs {
-//					remove(getByName("server"))
+					configureEach {
+						vmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:+IgnoreUnrecognizedVMOptions")
+					}
 
 					named("client") {
 						client()
@@ -77,7 +78,7 @@ class PlatformPlugin : Plugin<Project> {
 
 			tasks.withType<RemapJarTask>()["remapJar"].apply {
 				dependsOn(shadowJar)
-				inputFile = shadowJar.archiveFile as RegularFileProperty
+				inputFile.set(shadowJar.archiveFile)
 				archiveClassifier = project.name
 			}