do not specify java version per-project

btwonion · Oct 19, 2024 · e51b12c · e51b12c
1 parent 7634e5a
commit e51b12c
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -80,7 +80,7 @@ dependencies {
     include(libs.konfig)
 }
 
-val javaVersion = property("vers.javaVer").toString()
+val javaVersion = if (stonecutter.eval(mcVersion, ">=1.20.6")) 21 else 17
 val modId = property("mod.id").toString()
 val modName = property("mod.name").toString()
 val modDescription = property("mod.description").toString()
@@ -125,7 +125,7 @@ tasks {
 
     withType<KotlinCompile> {
         compilerOptions {
-            jvmTarget = JvmTarget.fromTarget(javaVersion)
+            jvmTarget = JvmTarget.fromTarget(javaVersion.toString())
         }
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -12,6 +12,6 @@ mod.id=autodrop
 mod.name=autodrop
 mod.description=Simply drops specific items after pickup
 mod.beta=0
-mod.major-version=2.0.2
+mod.major-version=2.0.3
 mod.mixins=autodrop.mixins.json
 mod.supported-loaders=fabric,quilt,neoforge
diff --git a/versions/1.20.4-fabric/gradle.properties b/versions/1.20.4-fabric/gradle.properties
@@ -1,10 +1,10 @@
 vers.mcVersion=1.20.4
 vers.mcVersionRange=>=1.20.3
 vers.supportedMcVersions=1.20.4
+
 vers.deps.quiltmappings=1.20.4+build.3
 vers.deps.fapi=0.97.1+1.20.4
 vers.deps.yacl=3.5.0+1.20.4-fabric
 vers.deps.modMenu=9.2.0-beta.2
-vers.javaVer=17
 
 loom.platform=fabric
diff --git a/versions/1.20.4-neoforge/gradle.properties b/versions/1.20.4-neoforge/gradle.properties
@@ -1,10 +1,10 @@
 vers.mcVersion=1.20.4
 vers.mcVersionRange=>=1.20.3
 vers.supportedMcVersions=1.20.4
+
 vers.deps.quiltmappings=1.20.4+build.3
 vers.deps.fml=20.4.237
 vers.deps.yacl=3.5.0+1.20.4-neoforge
 vers.deps.kff=4.11.0
-vers.javaVer=17
 
 loom.platform=neoforge
diff --git a/versions/1.20.6-fabric/gradle.properties b/versions/1.20.6-fabric/gradle.properties
@@ -6,6 +6,5 @@ vers.deps.quiltmappings=1.20.6+build.6
 vers.deps.fapi=0.100.8+1.20.6
 vers.deps.yacl=3.5.0+1.20.6-fabric
 vers.deps.modMenu=10.0.0-beta.1
-vers.javaVer=21
 
 loom.platform=fabric
diff --git a/versions/1.20.6-neoforge/gradle.properties b/versions/1.20.6-neoforge/gradle.properties
@@ -7,6 +7,4 @@ vers.deps.fml=20.6.121
 vers.deps.yacl=3.5.0+1.20.6-neoforge
 vers.deps.kff=5.4.0
 
-vers.javaVer=21
-
 loom.platform=neoforge
diff --git a/versions/1.21-fabric/gradle.properties b/versions/1.21-fabric/gradle.properties
@@ -7,6 +7,4 @@ vers.deps.fapi=0.100.8+1.21
 vers.deps.yacl=3.5.0+1.21-fabric
 vers.deps.modMenu=11.0.0-beta.1
 
-vers.javaVer=21
-
 loom.platform=fabric
diff --git a/versions/1.21-neoforge/gradle.properties b/versions/1.21-neoforge/gradle.properties
@@ -7,6 +7,4 @@ vers.deps.fml=21.0.167
 vers.deps.yacl=3.5.0+1.21-neoforge
 vers.deps.kff=5.4.0
 
-vers.javaVer=21
-
 loom.platform=neoforge
diff --git a/versions/1.21.2-fabric/gradle.properties b/versions/1.21.2-fabric/gradle.properties
@@ -7,6 +7,4 @@ vers.deps.fapi=0.106.0+1.21.2
 vers.deps.yacl=3.5.0+1.21-fabric
 vers.deps.modMenu=12.0.0-beta.1
 
-vers.javaVer=21
-
 loom.platform=fabric