update dependencies, target jvm 11, exclude ios sim tests

jillesvangurp · Jul 26, 2024 · 79aa237 · 79aa237
1 parent 8165076
commit 79aa237
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,15 +23,6 @@ allprojects {
 
 subprojects {
 
-    tasks.withType<KotlinJvmCompile> {
-        jvmTargetValidationMode.set(WARNING)
-
-        kotlinOptions {
-            // this is the minimum LTS version we support, 11 and 8 are no longer supported
-            jvmTarget = "17"
-        }
-    }
-
     tasks.register("versionCheck") {
         doLast {
             if (rootProject.version == "unspecified") {

diff --git a/search-client/build.gradle.kts b/search-client/build.gradle.kts
@@ -7,6 +7,8 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 import java.net.URI
 import java.net.URL
 import java.util.*
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 // Stub secrets to let the project sync and build without the publication values set up
@@ -59,6 +61,11 @@ val searchEngine = getStringProperty("searchEngine", "es-8")
 
 kotlin {
     jvm {
+        // should work for android as well
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
     }
     js(IR) {
         browser {
@@ -185,11 +192,15 @@ kotlin {
                 languageVersion = "1.9"
                 apiVersion = "1.9"
             }
-
         }
     }
 }
 
+tasks.named("iosSimulatorArm64Test") {
+    // requires IOS simulator and tens of GB of other stuff to be installed
+    // so keep it disabled
+    enabled = false
+}
 
 configure<ComposeExtension> {
     buildAdditionalArgs.set(listOf("--force-rm"))

diff --git a/search-dsls/build.gradle.kts b/search-dsls/build.gradle.kts
@@ -1,5 +1,7 @@
 @file:OptIn(ExperimentalWasmDsl::class)
 
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
@@ -8,8 +10,13 @@ plugins {
 
 kotlin {
     jvm {
-
+        // should work for android as well
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
     }
+
     js(IR) {
         browser()
         nodejs {
@@ -82,3 +89,10 @@ kotlin {
     }
 }
 
+tasks.named("iosSimulatorArm64Test") {
+    // requires IOS simulator and tens of GB of other stuff to be installed
+    // so keep it disabled
+    enabled = false
+}
+
+
diff --git a/versions.properties b/versions.properties
@@ -17,22 +17,24 @@ version.com.github.doyaaaaaken..kotlin-csv=1.9.3
 
 version.com.github.jillesvangurp..kotlin4example=1.1.5
 
-version.com.jillesvangurp..json-dsl=3.0.1
+version.com.jillesvangurp..json-dsl=3.0.3
 
-version.com.jillesvangurp..kotlinx-serialization-extensions=1.0.2
+version.com.jillesvangurp..kotlinx-serialization-extensions=1.0.4
 
 version.io.github.microutils..kotlin-logging=3.0.5
 ##                               # available=4.0.0-beta-1
 ##                               # available=4.0.0-beta-2
 
-version.junit.jupiter=5.10.2
+version.junit.jupiter=5.10.3
 ##        # available=5.11.0-M1
 ##        # available=5.11.0-M2
 
 version.kotest=5.9.1
 
 version.kotlin=2.0.0
+## # available=2.0.10-RC
 ## # available=2.0.20-Beta1
+## # available=2.0.20-Beta2
 
 version.kotlinx.coroutines=1.8.1
 ##             # available=1.9.0-RC
@@ -43,6 +45,7 @@ version.kotlinx.serialization=1.7.1
 
  version.ktor=2.3.12
 ### available=3.0.0-beta-1
+### available=3.0.0-beta-2
 
 version.org.apache.logging.log4j..log4j-to-slf4j=2.23.1
 ##                                   # available=3.0.0-alpha1