From 63a5fcff9711321c8e414ec79e24fe8c3604ca62 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 7 Nov 2025 14:40:10 +0100 Subject: [PATCH] Add Kotlin plugin and configure build scripts for Kotlin compatibility, integrate `exposed` library dependencies, and enhance JVM settings. Signed-off-by: Chaoscaot --- CommonCore/SQL/build.gradle.kts | 8 +++++++- KotlinCore/build.gradle.kts | 7 ++++++- VelocityCore/Dependencies/build.gradle.kts | 6 ++++++ buildSrc/build.gradle | 2 +- gradle.properties | 1 + 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CommonCore/SQL/build.gradle.kts b/CommonCore/SQL/build.gradle.kts index b6831f70..95106b76 100644 --- a/CommonCore/SQL/build.gradle.kts +++ b/CommonCore/SQL/build.gradle.kts @@ -19,13 +19,18 @@ plugins { steamwar.java - kotlin("jvm") + steamwar.kotlin } kotlin { jvmToolchain(8) } +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + sourceSets { main { java { @@ -62,6 +67,7 @@ dependencies { implementation("org.yaml:snakeyaml:2.2") + compileOnlyApi("org.jetbrains.kotlin:kotlin-stdlib:2.2.21") api(libs.exposedCore) api(libs.exposedDao) api(libs.exposedJdbc) diff --git a/KotlinCore/build.gradle.kts b/KotlinCore/build.gradle.kts index c57d022e..a352d7e5 100644 --- a/KotlinCore/build.gradle.kts +++ b/KotlinCore/build.gradle.kts @@ -27,11 +27,16 @@ tasks.build { } tasks.shadowJar { - exclude("org/**") + exclude("org/intellij/**", "org/slf4j/**") } dependencies { compileOnly(libs.paperapi21) compileOnly(libs.nms21) compileOnly(project(":SpigotCore")) + + implementation(libs.exposedCore) + implementation(libs.exposedDao) + implementation(libs.exposedJdbc) + implementation(libs.exposedTime) } diff --git a/VelocityCore/Dependencies/build.gradle.kts b/VelocityCore/Dependencies/build.gradle.kts index 58c068f0..20d16019 100644 --- a/VelocityCore/Dependencies/build.gradle.kts +++ b/VelocityCore/Dependencies/build.gradle.kts @@ -19,6 +19,7 @@ plugins { steamwar.java + steamwar.kotlin alias(libs.plugins.shadow) } @@ -55,4 +56,9 @@ dependencies { implementation(libs.apolloprotos) implementation(libs.nbt) + + implementation(libs.exposedCore) + implementation(libs.exposedDao) + implementation(libs.exposedJdbc) + implementation(libs.exposedTime) } \ No newline at end of file diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 5aa2e416..e1ee5bb0 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -34,5 +34,5 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.10") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21") } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index e61a399d..7f26e391 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,3 +20,4 @@ org.gradle.daemon = true org.gradle.parallel = true org.gradle.workers.max = 16 +org.gradle.jvmargs=-Xmx4096m \ No newline at end of file