From 8683289dfc50dc8557281222dea6c71c58fdf6c0 Mon Sep 17 00:00:00 2001
From: isXander <xander@isxander.dev>
Date: Mon, 15 Apr 2024 16:54:12 +0100
Subject: Make sure builds are set to the correct JDK version for the minecraft
 target

---
 build.gradle.kts                              | 19 ++++++++++++++++++-
 versions/1.20.1-fabric/gradle.properties      |  4 +++-
 versions/1.20.1-forge/gradle.properties       |  4 +++-
 versions/1.20.4-fabric/gradle.properties      |  4 +++-
 versions/1.20.4-neoforge/gradle.properties    |  4 +++-
 versions/1.20.5-pre1-fabric/gradle.properties |  4 +++-
 6 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f6e65e5..016ff2a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `java-library`
     kotlin("jvm") version "1.9.22"
@@ -194,6 +196,21 @@ machete {
     json.enabled.set(false)
 }
 
+java {
+    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.withType<JavaCompile> {
+    options.release.set(findProperty("java.version")!!.toString().toInt())
+}
+
+tasks.withType<KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = findProperty("java.version")!!.toString()
+    }
+}
+
 publishMods {
     displayName.set("YetAnotherConfigLib $versionWithoutMC for MC $mcVersion")
     file.set(tasks.remapJar.get().archiveFile)
@@ -248,7 +265,7 @@ publishMods {
         github {
             repository.set(githubProject)
             accessToken.set(findProperty("github.token")?.toString())
-            //commitish.set(grgit.branch.current().name)
+            commitish.set(grgit.branch.current().name)
         }
 
         tasks.getByName("publishGithub") {
diff --git a/versions/1.20.1-fabric/gradle.properties b/versions/1.20.1-fabric/gradle.properties
index 2665843..abee145 100644
--- a/versions/1.20.1-fabric/gradle.properties
+++ b/versions/1.20.1-fabric/gradle.properties
@@ -1,5 +1,7 @@
 loom.platform=fabric
 
+java.version=17
+
 deps.quiltMappings=23
 deps.fabricApi=0.92.0+1.20.1
-fmj.mcDep=1.20.1
\ No newline at end of file
+fmj.mcDep=1.20.1
diff --git a/versions/1.20.1-forge/gradle.properties b/versions/1.20.1-forge/gradle.properties
index 36d4f13..a4c8daf 100644
--- a/versions/1.20.1-forge/gradle.properties
+++ b/versions/1.20.1-forge/gradle.properties
@@ -1,5 +1,7 @@
 loom.platform=forge
 
+java.version=17
+
 deps.quiltMappings=23
 deps.forge=1.20.1-47.2.23
-fmj.mcDep=1.20.1
\ No newline at end of file
+fmj.mcDep=1.20.1
diff --git a/versions/1.20.4-fabric/gradle.properties b/versions/1.20.4-fabric/gradle.properties
index deb62e4..542f0fa 100644
--- a/versions/1.20.4-fabric/gradle.properties
+++ b/versions/1.20.4-fabric/gradle.properties
@@ -1,5 +1,7 @@
 loom.platform=fabric
 
+java.version=17
+
 deps.quiltMappings=3
 deps.fabricApi=0.96.11+1.20.4
-fmj.mcDep=1.20.4
\ No newline at end of file
+fmj.mcDep=1.20.4
diff --git a/versions/1.20.4-neoforge/gradle.properties b/versions/1.20.4-neoforge/gradle.properties
index 745c594..e5ff9c7 100644
--- a/versions/1.20.4-neoforge/gradle.properties
+++ b/versions/1.20.4-neoforge/gradle.properties
@@ -1,5 +1,7 @@
 loom.platform=neoforge
 
+java.version=17
+
 deps.quiltMappings=3
 deps.neoforge=20.4.130-beta
-fmj.mcDep=1.20.3,1.20.4
\ No newline at end of file
+fmj.mcDep=1.20.3,1.20.4
diff --git a/versions/1.20.5-pre1-fabric/gradle.properties b/versions/1.20.5-pre1-fabric/gradle.properties
index ce8ea68..e48872e 100644
--- a/versions/1.20.5-pre1-fabric/gradle.properties
+++ b/versions/1.20.5-pre1-fabric/gradle.properties
@@ -1,5 +1,7 @@
 loom.platform=fabric
 
+java.version=21
+
 deps.quiltMappings=
 deps.fabricApi=0.96.15+1.20.5
-fmj.mcDep=~1.20.5-
\ No newline at end of file
+fmj.mcDep=~1.20.5-
-- 
cgit