fix(build): java target version

Cubxity · Apr 23, 2023 · e0645ba · e0645ba
1 parent 94eee88
commit e0645ba
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -44,12 +44,10 @@ subprojects {
 
     tasks.withType<KotlinCompile> {
         kotlinOptions {
+            kotlinOptions.jvmTarget = "1.8"
             freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
         }
     }
-    configure<KotlinJvmProjectExtension> {
-        jvmToolchain(8)
-    }
     configure<JavaPluginExtension> {
         targetCompatibility = JavaVersion.VERSION_1_8
     }

diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts
@@ -59,9 +59,8 @@ loom {
 
 tasks {
     compileKotlin {
-        kotlinOptions.jvmTarget = "1.8"
+        kotlinOptions.jvmTarget = "16"
     }
-
     processResources {
         inputs.property("version", project.version)
 
@@ -75,6 +74,11 @@ tasks {
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_16
+    targetCompatibility = JavaVersion.VERSION_16
+}
+
 blossom {
     replaceTokenIn("src/main/kotlin/dev/cubxity/plugins/metrics/fabric/bootstrap/UnifiedMetricsFabricBootstrap.kt")
     replaceToken("@version@", version)

diff --git a/platforms/minestom/build.gradle.kts b/platforms/minestom/build.gradle.kts
@@ -31,10 +31,6 @@ dependencies {
     testImplementation("com.github.minestom.minestom:Minestom:a9e319f961")
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
 tasks {
     shadowJar {
         archiveClassifier.set("")
@@ -46,9 +42,10 @@ tasks {
         relocate("io.prometheus", "dev.cubxity.plugins.metrics.libs.io.prometheus")
     }
     compileKotlin {
-        kotlinOptions {
-            jvmTarget = "17"
-        }
+        kotlinOptions.jvmTarget = "17"
+    }
+    compileTestKotlin {
+        kotlinOptions.jvmTarget = "17"
     }
     processResources {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
@@ -59,3 +56,7 @@ tasks {
         }
     }
 }
+
+java {
+    targetCompatibility = JavaVersion.VERSION_17
+}