From fc4dc3129dca99f715a416c1ecc90383621c7f9f Mon Sep 17 00:00:00 2001
From: Tommy Ettinger <tommy.ettinger@gmail.com>
Date: Sat, 19 Oct 2024 03:31:10 -0700
Subject: [PATCH] Don't lock Kotlin version. Other minor fixes.

---
 .../gdx/liftoff/data/platforms/Android.kt     |  2 +-
 .../kotlin/gdx/liftoff/data/platforms/Core.kt | 62 ++++++++++---------
 .../gdx/liftoff/data/platforms/Lwjgl3.kt      |  2 +-
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/main/kotlin/gdx/liftoff/data/platforms/Android.kt b/src/main/kotlin/gdx/liftoff/data/platforms/Android.kt
index 8d6c6517..d5d7e695 100644
--- a/src/main/kotlin/gdx/liftoff/data/platforms/Android.kt
+++ b/src/main/kotlin/gdx/liftoff/data/platforms/Android.kt
@@ -150,7 +150,7 @@ buildscript {
 }
 plugins {
   id "com.android.application" version "8.4.2"
-  ${if (latePlugin) "  id 'org.jetbrains.kotlin.android' version '2.0.21'\n" else ""}}
+  ${if (latePlugin) "  id 'org.jetbrains.kotlin.android' version '${project.languages.getVersion("kotlin")}'\n" else ""}}
 
 android {
   namespace "${project.basic.rootPackage}"
diff --git a/src/main/kotlin/gdx/liftoff/data/platforms/Core.kt b/src/main/kotlin/gdx/liftoff/data/platforms/Core.kt
index 2a355de3..df59e87c 100644
--- a/src/main/kotlin/gdx/liftoff/data/platforms/Core.kt
+++ b/src/main/kotlin/gdx/liftoff/data/platforms/Core.kt
@@ -1,6 +1,7 @@
 package gdx.liftoff.data.platforms
 
 import gdx.liftoff.data.files.gradle.GradleFile
+import gdx.liftoff.data.languages.Kotlin
 import gdx.liftoff.data.project.Project
 import gdx.liftoff.views.GdxPlatform
 
@@ -40,39 +41,39 @@ class CoreGradleFile(val project: Project) : GradleFile(Core.ID) {
     return """
 plugins {
   id "java-library"
-${if ( project.rootGradle.plugins.contains("kotlin")) "  id 'org.jetbrains.kotlin.jvm' version '2.0.21'\n" else ""}}
+${if ( project.rootGradle.plugins.contains("kotlin")) "  id 'org.jetbrains.kotlin.jvm' version '${project.languages.getVersion("kotlin")}'\n" else ""}}
 
-  // From https://lyze.dev/2021/04/29/libGDX-Internal-Assets-List/
-  // The article can be helpful when using assets.txt in your project.
-  tasks.register('generateAssetList') {
-    inputs.dir("${'$'}{project.rootDir}/assets/")
-    // projectFolder/assets
-    File assetsFolder = new File("${'$'}{project.rootDir}/assets/")
-    // projectFolder/assets/assets.txt
-    File assetsFile = new File(assetsFolder, "assets.txt")
-    // delete that file in case we've already created it
-    assetsFile.delete()
+// From https://lyze.dev/2021/04/29/libGDX-Internal-Assets-List/
+// The article can be helpful when using assets.txt in your project.
+tasks.register('generateAssetList') {
+  inputs.dir("${'$'}{project.rootDir}/assets/")
+  // projectFolder/assets
+  File assetsFolder = new File("${'$'}{project.rootDir}/assets/")
+  // projectFolder/assets/assets.txt
+  File assetsFile = new File(assetsFolder, "assets.txt")
+  // delete that file in case we've already created it
+  assetsFile.delete()
 
-    // iterate through all files inside that folder
-    // convert it to a relative path
-    // and append it to the file assets.txt
-    fileTree(assetsFolder).collect { assetsFolder.relativePath(it) }.sort().each {
-      assetsFile.append(it + "\n")
-    }
+  // iterate through all files inside that folder
+  // convert it to a relative path
+  // and append it to the file assets.txt
+  fileTree(assetsFolder).collect { assetsFolder.relativePath(it) }.sort().each {
+    assetsFile.append(it + "\n")
   }
-  processResources.dependsOn 'generateAssetList'
+}
+processResources.dependsOn 'generateAssetList'
 
-  compileJava {
-    options.incremental = true
-  }${if (project.rootGradle.plugins.contains("kotlin")) {
-      """
-  compileKotlin.compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_${
-        if (project.advanced.javaVersion.removePrefix("1.") == "8") {
-          "1_8"
-        } else {
-          project.advanced.javaVersion.removePrefix("1.")
-        }})
-  """
+compileJava {
+  options.incremental = true
+}${if (project.rootGradle.plugins.contains("kotlin")) {
+    """
+compileKotlin.compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_${
+      if (project.advanced.javaVersion.removePrefix("1.") == "8") {
+        "1_8"
+      } else {
+        project.advanced.javaVersion.removePrefix("1.")
+      }})
+"""
     } else {
       ""
     }}
@@ -80,7 +81,8 @@ ${if ( project.rootGradle.plugins.contains("kotlin")) "  id 'org.jetbrains.kotli
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 eclipse.project.name = appName + '-core'
 
-sourceCompatibility = ${project.advanced.javaVersion}
+java.sourceCompatibility = ${project.advanced.javaVersion}
+java.targetCompatibility = ${project.advanced.javaVersion}
 
 dependencies {
 ${joinDependencies(dependencies, "api")}
diff --git a/src/main/kotlin/gdx/liftoff/data/platforms/Lwjgl3.kt b/src/main/kotlin/gdx/liftoff/data/platforms/Lwjgl3.kt
index 96fb42e9..66c65f44 100644
--- a/src/main/kotlin/gdx/liftoff/data/platforms/Lwjgl3.kt
+++ b/src/main/kotlin/gdx/liftoff/data/platforms/Lwjgl3.kt
@@ -145,7 +145,7 @@ buildscript {
 plugins {
   id "io.github.fourlastor.construo" version "1.4.1"
   id "application"
-${if (project.rootGradle.plugins.contains("kotlin")) "  id 'org.jetbrains.kotlin.jvm' version '2.0.21'\n" else ""}}
+${if (project.rootGradle.plugins.contains("kotlin")) "  id 'org.jetbrains.kotlin.jvm' version '${project.languages.getVersion("kotlin")}'\n" else ""}}
 
 import io.github.fourlastor.construo.Target