From 2158be40cd1211f1eb38e9fa4e869a74f10b80cc Mon Sep 17 00:00:00 2001 From: Will FP Date: Thu, 5 Dec 2024 16:29:08 +0000 Subject: [PATCH] Updated gradle compilation config --- eco-core/core-backend-modern/build.gradle.kts | 6 ++++-- eco-core/core-backend/build.gradle.kts | 6 ++++-- eco-core/core-nms/modern/build.gradle.kts | 6 ++++-- eco-core/core-nms/v1_21/build.gradle.kts | 6 ++++-- gradle.properties | 1 + 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/eco-core/core-backend-modern/build.gradle.kts b/eco-core/core-backend-modern/build.gradle.kts index 86055a2e..69e57191 100644 --- 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 index e5aaca60..8ff28a1f 100644 --- 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 index 541305ed..c2a50112 100644 --- 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 index 1c92eeb3..c9356f17 100644 --- 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 index d5880a4b..4841863e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ version = 6.74.4 +kotlin.daemon.jvmargs=-Xmx2g -XX:+UseG1GC -XX:MaxMetaspaceSize=512m