From 5b55034a8bcce787ce588dac3d9362ed466502b2 Mon Sep 17 00:00:00 2001
From: Sargun Vohra <sargun.vohra@gmail.com>
Date: Thu, 2 Jan 2025 17:49:39 -0800
Subject: [PATCH] fix: configure JVM target to a reasonable LTS (11) (#227)

Previously we used whatever target we built with (23). But this is a library, so we should be compatible with currently supported LTS versions.

fixes #223
---
 demo-app/build.gradle.kts                         | 10 ++++++++--
 gradle.properties                                 |  1 +
 lib/maplibre-compose-expressions/build.gradle.kts | 10 ++++++++--
 lib/maplibre-compose-material3/build.gradle.kts   | 10 ++++++++--
 lib/maplibre-compose/build.gradle.kts             | 10 ++++++++--
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts
index ccfb1610..458a77e9 100644
--- a/demo-app/build.gradle.kts
+++ b/demo-app/build.gradle.kts
@@ -40,13 +40,19 @@ android {
 
 kotlin {
   androidTarget {
-    compilerOptions { jvmTarget.set(JvmTarget.JVM_11) }
+    compilerOptions {
+      jvmTarget.set(JvmTarget.valueOf(project.properties["jvmTarget"]!!.toString()))
+    }
     instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
   }
   iosArm64()
   iosSimulatorArm64()
   iosX64()
-  jvm("desktop")
+  jvm("desktop") {
+    compilerOptions {
+      jvmTarget.set(JvmTarget.valueOf(project.properties["jvmTarget"]!!.toString()))
+    }
+  }
   js(IR) {
     browser { commonWebpackConfig { outputFileName = "app.js" } }
     binaries.executable()
diff --git a/gradle.properties b/gradle.properties
index 33845fea..06fae1fe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,6 +2,7 @@ androidMinSdk=23
 androidCompileSdk=35
 androidTargetSdk=35
 iosDeploymentTarget=12.0
+jvmTarget=JVM_11
 kotlin.code.style=official
 kotlin.daemon.jvmargs=-Xmx2048M
 kotlin.incremental.wasm=true
diff --git a/lib/maplibre-compose-expressions/build.gradle.kts b/lib/maplibre-compose-expressions/build.gradle.kts
index f1029b41..5eb29626 100644
--- a/lib/maplibre-compose-expressions/build.gradle.kts
+++ b/lib/maplibre-compose-expressions/build.gradle.kts
@@ -27,14 +27,20 @@ mavenPublishing {
 
 kotlin {
   androidTarget {
-    compilerOptions { jvmTarget.set(JvmTarget.JVM_11) }
+    compilerOptions {
+      jvmTarget.set(JvmTarget.valueOf(project.properties["jvmTarget"]!!.toString()))
+    }
     instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
     publishLibraryVariants("release", "debug")
   }
   iosArm64()
   iosSimulatorArm64()
   iosX64()
-  jvm("desktop")
+  jvm("desktop") {
+    compilerOptions {
+      jvmTarget.set(JvmTarget.valueOf(project.properties["jvmTarget"]!!.toString()))
+    }
+  }
   js(IR) { browser() }
   wasmJs { browser() }
 
diff --git a/lib/maplibre-compose-material3/build.gradle.kts b/lib/maplibre-compose-material3/build.gradle.kts
index 76a3750f..95b293d9 100644
--- a/lib/maplibre-compose-material3/build.gradle.kts
+++ b/lib/maplibre-compose-material3/build.gradle.kts
@@ -28,14 +28,20 @@ mavenPublishing {
 
 kotlin {
   androidTarget {
-    compilerOptions { jvmTarget.set(JvmTarget.JVM_11) }
+    compilerOptions {
+      jvmTarget.set(JvmTarget.valueOf(project.properties["jvmTarget"]!!.toString()))
+    }
     instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
     publishLibraryVariants("release", "debug")
   }
   iosArm64()
   iosSimulatorArm64()
   iosX64()
-  jvm("desktop")
+  jvm("desktop") {
+    compilerOptions {
+      jvmTarget.set(JvmTarget.valueOf(project.properties["jvmTarget"]!!.toString()))
+    }
+  }
   js(IR) { browser() }
 
   cocoapods {
diff --git a/lib/maplibre-compose/build.gradle.kts b/lib/maplibre-compose/build.gradle.kts
index baa31416..80717fe2 100644
--- a/lib/maplibre-compose/build.gradle.kts
+++ b/lib/maplibre-compose/build.gradle.kts
@@ -47,14 +47,20 @@ val copyDesktopResources by
 
 kotlin {
   androidTarget {
-    compilerOptions { jvmTarget.set(JvmTarget.JVM_11) }
+    compilerOptions {
+      jvmTarget.set(JvmTarget.valueOf(project.properties["jvmTarget"]!!.toString()))
+    }
     instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
     publishLibraryVariants("release", "debug")
   }
   iosArm64()
   iosSimulatorArm64()
   iosX64()
-  jvm("desktop")
+  jvm("desktop") {
+    compilerOptions {
+      jvmTarget.set(JvmTarget.valueOf(project.properties["jvmTarget"]!!.toString()))
+    }
+  }
   js(IR) { browser() }
 
   cocoapods {