Changed min java target to 11

husker-dev · Dec 13, 2024 · b254b51 · b254b51
1 parent 1ee8610
commit b254b51
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 27 deletions.
diff --git a/modules/core/build.gradle b/modules/core/build.gradle
@@ -7,13 +7,10 @@ apply from: addon(addons_propertyClass)
 
 sourceSets {
     main.java.srcDirs = ['kotlin']
-    main.resources.srcDirs = ['resources']
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+kotlin {
+    jvmToolchain(11)
 }
 
 maven {

diff --git a/modules/core/native/build.gradle b/modules/core/native/build.gradle
@@ -2,8 +2,11 @@
 apply from: addon(addons_mavenPublish)
 apply from: addon(addons_nativeCompilation)
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
 
 compilation {
     baseName = "lib"

diff --git a/modules/jogl/build.gradle b/modules/jogl/build.gradle
@@ -6,13 +6,10 @@ apply from: addon(addons_mavenPublish)
 
 sourceSets {
     main.java.srcDirs = ['kotlin']
-    test.java.srcDirs = ['test']
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+kotlin {
+    jvmToolchain(11)
 }
 
 maven {

diff --git a/modules/libgdx/build.gradle b/modules/libgdx/build.gradle
@@ -6,13 +6,10 @@ apply from: addon(addons_mavenPublish)
 
 sourceSets {
     main.java.srcDirs = ['kotlin']
-    test.java.srcDirs = ['test']
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+kotlin {
+    jvmToolchain(11)
 }
 
 maven {

diff --git a/modules/lwjgl/build.gradle b/modules/lwjgl/build.gradle
@@ -6,13 +6,10 @@ apply from: addon(addons_mavenPublish)
 
 sourceSets {
     main.java.srcDirs = ['kotlin']
-    test.java.srcDirs = ['test']
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+kotlin {
+    jvmToolchain(11)
 }
 
 maven {

diff --git a/modules/lwjgl2/build.gradle b/modules/lwjgl2/build.gradle
@@ -6,13 +6,10 @@ apply from: addon(addons_mavenPublish)
 
 sourceSets {
     main.java.srcDirs = ['kotlin']
-    test.java.srcDirs = ['test']
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+kotlin {
+    jvmToolchain(11)
 }
 
 maven {