From 52dc74a487694576c29bb6efeb60626e622b2280 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Sun, 4 Aug 2024 21:15:24 +0200 Subject: [PATCH] Finish VelocityCore --- CommandFramework/build.gradle.kts | 6 +++++- CommonCore/build.gradle.kts | 6 +++++- VelocityCore/Persistent/build.gradle.kts | 5 +++++ VelocityCore/build.gradle.kts | 9 +++++++++ build.gradle.kts | 5 ----- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/CommandFramework/build.gradle.kts b/CommandFramework/build.gradle.kts index 880a4451..825b7a0f 100644 --- a/CommandFramework/build.gradle.kts +++ b/CommandFramework/build.gradle.kts @@ -27,7 +27,11 @@ version = "" java { sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +tasks.compileJava { + options.encoding = "UTF-8" } sourceSets { diff --git a/CommonCore/build.gradle.kts b/CommonCore/build.gradle.kts index a3343ba6..b6b810ba 100644 --- a/CommonCore/build.gradle.kts +++ b/CommonCore/build.gradle.kts @@ -27,7 +27,11 @@ version = "" java { sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +tasks.compileJava { + options.encoding = "UTF-8" } sourceSets { diff --git a/VelocityCore/Persistent/build.gradle.kts b/VelocityCore/Persistent/build.gradle.kts index 77f2d623..35e7510c 100644 --- a/VelocityCore/Persistent/build.gradle.kts +++ b/VelocityCore/Persistent/build.gradle.kts @@ -8,6 +8,11 @@ tasks.compileJava { options.encoding = "UTF-8" } +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + sourceSets { main { java { diff --git a/VelocityCore/build.gradle.kts b/VelocityCore/build.gradle.kts index 2e8d5a78..4a6a3c59 100644 --- a/VelocityCore/build.gradle.kts +++ b/VelocityCore/build.gradle.kts @@ -18,10 +18,19 @@ tasks.shadowJar { duplicatesStrategy = DuplicatesStrategy.INCLUDE } +tasks.build { + finalizedBy(tasks.shadowJar) +} + tasks.compileJava { options.encoding = "UTF-8" } +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + sourceSets { main { java { diff --git a/build.gradle.kts b/build.gradle.kts index a33cd959..5ebf3578 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,11 +29,6 @@ plugins { group = "de.steamwar" version = "" -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_21 -} - allprojects { repositories { mavenCentral()