Java 17

GlennFolker · Feb 13, 2024 · b488384 · b488384
1 parent 4387f49
commit b488384
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -50,9 +50,7 @@ configure(allprojects){
             ext."$prop.key" = prop.value
         }
 
-        compilerVersion = JavaVersion.current().ordinal() - JavaVersion.VERSION_17.ordinal() + 17
         useJitpack = Boolean.valueOf(mindustryBE)
-
         isDev = project.hasProperty('modDev') && Boolean.valueOf(project.property('modDev') as String)
 
         localGltfrenzy = {
@@ -103,7 +101,7 @@ configure(allprojects){
 
     tasks.withType(JavaCompile).configureEach{
         // Use Java 17+ syntax, but target Java 8 bytecode version.
-        sourceCompatibility = compilerVersion
+        sourceCompatibility = 17
         options.release = 8
         options.compilerArgs << '-Xlint:-options'
 

diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@ modArtifact = Confictura
 # (see https://github.com/GlennFolker/EntityAnno?tab=readme-ov-file#version-compatibility).
 entVersion = v146.0.2
 # glTFrenzy version, for loading 3D models.
-glTFrenzyVersion = 12bf8369594e9b93494c7c253b2f45210e33ef37
+glTFrenzyVersion = b64f10f371b0913ef7b001c768ece2935368d306
 # Set to `true` if the mod is compiled against Mindustry bleeding-edge build.
 # See documents on `mindustryVersion` and `mindustryBEVersion`.
 mindustryBE = false