kotlin 2.2.10, minSdk 21, jdk 17

Author: ExNDY

.gitignore

@@ -4,6 +4,7 @@
 .classpath
 .vscode
 .idea
+.kotlin
 build
 *.iml
 Pods

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-kotlinTestVersion = "1.9.25"
+kotlinTestVersion = "2.2.10"
 androidAppCompatVersion = "1.7.1"
 materialDesignVersion = "1.13.0"
 androidLifecycleVersion = "2.2.0"
 androidCoreTestingVersion = "1.7.0"
 testJUnitExtVersion = "1.3.0"
-coroutinesVersion = "1.8.1"
-kotlinxSerializationVersion = "1.6.3"
+coroutinesVersion = "1.10.2"
+kotlinxSerializationVersion = "1.9.0"
 mokoTestVersion = "0.6.1"
 mokoJavascriptVersion = "0.4.0"
 ziplineVersion = "1.23.0"

javascript-build-logic/build.gradle.kts

@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
     api("dev.icerock:mobile-multiplatform:0.14.1")
-    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
+    api("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.10")
     api("com.android.tools.build:gradle:8.12.3")
     api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0")
 }

javascript-build-logic/src/main/kotlin/android-base-convention.gradle.kts

@@ -8,7 +8,12 @@ configure<BaseExtension> {
     compileSdkVersion(36)
 
     defaultConfig {
-        minSdk = 18
+        minSdk = 21
         targetSdk = 36
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }

javascript/src/iosMain/kotlin/dev/icerock/moko/javascript/JavaScriptEngine.kt

@@ -45,6 +45,7 @@ actual class JavaScriptEngine actual constructor() {
         )
     }
 
+    @OptIn(BetaInteropApi::class)
     actual fun setContextObjects(vararg context: Pair<String, JsType>) {
         context.forEach { (key, value) ->
             val contextObject: Any? = prepareValueForJsContext(value)
@@ -55,6 +56,7 @@ actual class JavaScriptEngine actual constructor() {
         }
     }
 
+    @OptIn(BetaInteropApi::class)
     actual fun evaluate(context: Map<String, JsType>, script: String): JsType {
         context.forEach { (key, value) ->
             jsContext.setObject(
@@ -132,9 +134,9 @@ private fun JSValue.toMokoJSType(): JsType {
             val jsonElement: JsonElement = json.parseToJsonElement(toString_().orEmpty())
             if (jsonElement is JsonObject || jsonElement is JsonArray) JsType.Json(jsonElement)
             else JsType.Str(toString_().orEmpty())
-        } catch (ex: SerializationException) {
+        } catch (_: SerializationException) {
             JsType.Str(toString_().orEmpty())
-        } catch (ex: IllegalStateException) {
+        } catch (_: IllegalStateException) {
             JsType.Str(toString_().orEmpty())
         }
         isNumber -> JsType.DoubleNum(toDouble())