updated gradle, agp, quickjs-android replaced on zipline-android, targetSdk = 36

ExNDY · ExNDY · commit 5f98b6529d07 · 2025-09-15T18:50:26.000+07:00
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:javascript:0.3.0")
+    commonMainApi("dev.icerock.moko:javascript:0.4.0")
 }
 ```
 
diff --git a/gradle.properties b/gradle.properties
@@ -3,10 +3,8 @@ org.gradle.configureondemand=false
 org.gradle.parallel=true
 
 kotlin.code.style=official
-kotlin.native.enableDependencyPropagation=false
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 android.useAndroidX=true
 
 mobile.multiplatform.iosTargetWarning=false
+kotlin.mpp.defaultHierarchies.template.enabled=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
-kotlinTestVersion = "1.6.21"
-androidAppCompatVersion = "1.2.0"
-materialDesignVersion = "1.0.0"
-androidLifecycleVersion = "2.1.0"
-androidCoreTestingVersion = "1.3.0"
-testJUnitExtVersion = "1.1.2"
-quickjsVersion = "0.9.2"
-coroutinesVersion = "1.6.0-native-mt"
-kotlinxSerializationVersion = "1.3.3"
+kotlinTestVersion = "1.9.25"
+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"
 mokoTestVersion = "0.6.1"
-mokoJavascriptVersion = "0.3.0"
+mokoJavascriptVersion = "0.4.0"
+ziplineVersion = "1.23.0"
 
 
 [libraries]
@@ -21,7 +21,7 @@ testRunner = { module = "androidx.test:runner", version.ref = "androidCoreTestin
 testRules = { module = "androidx.test:rules", version.ref = "androidCoreTestingVersion" }
 testJUnitExt = { module = "androidx.test.ext:junit", version.ref = "testJUnitExtVersion" }
 testJUnitExtKtx = { module = "androidx.test.ext:junit-ktx", version.ref = "testJUnitExtVersion" }
-quickjs = { module = "app.cash.quickjs:quickjs-android", version.ref = "quickjsVersion" }
+ziplineAndroid = { module = "app.cash.zipline:zipline-android", version.ref = "ziplineVersion" }
 coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutinesVersion" }
 kotlinSerialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationVersion" }
 kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlinTestVersion" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Sep 15 18:35:34 NOVT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/javascript-build-logic/build.gradle.kts b/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.6.21")
-    api("com.android.tools.build:gradle:7.0.1")
+    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
+    api("com.android.tools.build:gradle:8.12.3")
     api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0")
 }
diff --git a/javascript-build-logic/src/main/kotlin/android-app-convention.gradle.kts b/javascript-build-logic/src/main/kotlin/android-app-convention.gradle.kts
@@ -9,10 +9,6 @@ plugins {
 }
 
 android {
-    dexOptions {
-        javaMaxHeapSize = "2g"
-    }
-
     buildTypes {
         getByName("release") {
             isMinifyEnabled = true
@@ -24,9 +20,13 @@ android {
         }
     }
 
-    packagingOptions {
-        exclude("META-INF/*.kotlin_module")
-        exclude("META-INF/AL2.0")
-        exclude("META-INF/LGPL2.1")
+    packaging {
+        resources {
+            excludes += listOf(
+                "META-INF/*.kotlin_module",
+                "META-INF/AL2.0",
+                "META-INF/LGPL2.1"
+            )
+        }
     }
 }
diff --git a/javascript-build-logic/src/main/kotlin/android-base-convention.gradle.kts b/javascript-build-logic/src/main/kotlin/android-base-convention.gradle.kts
@@ -5,10 +5,10 @@
 import com.android.build.gradle.BaseExtension
 
 configure<BaseExtension> {
-    compileSdkVersion(30)
+    compileSdkVersion(36)
 
     defaultConfig {
-        minSdkVersion(18)
-        targetSdkVersion(30)
+        minSdk = 18
+        targetSdk = 36
     }
 }
diff --git a/javascript-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts b/javascript-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts
@@ -10,29 +10,44 @@ plugins {
 }
 
 kotlin {
-    ios()
+    iosX64()
+    iosArm64()
     iosSimulatorArm64()
-    android {
+    androidTarget {
         publishLibraryVariants("release", "debug")
     }
+
     sourceSets {
+        val mobileDeviceTest by creating
+
+        val commonMain by getting
+        val iosX64Main by getting
+        val iosArm64Main by getting
         val iosSimulatorArm64Main by getting
+
+        val iosMain by creating {
+            iosX64Main.dependsOn(this)
+            iosArm64Main.dependsOn(this)
+            iosSimulatorArm64Main.dependsOn(this)
+        }
+        iosMain.dependsOn(commonMain)
+
+        val iosX64Test by getting
+        val iosArm64Test by getting
         val iosSimulatorArm64Test by getting
 
-        val mobileDeviceTest by creating
+        val iosTest by creating {
+            iosX64Test.dependsOn(this)
+            iosArm64Test.dependsOn(this)
+            iosSimulatorArm64Test.dependsOn(this)
+        }
+        val androidUnitTest by getting
 
         val commonTest by getting
-        val iosMain by getting
-        val iosTest by getting
-        val androidAndroidTest by getting
-
-        iosSimulatorArm64Main.dependsOn(iosMain)
-        iosSimulatorArm64Test.dependsOn(iosTest)
 
         mobileDeviceTest.dependsOn(commonTest)
         iosTest.dependsOn(mobileDeviceTest)
-        androidAndroidTest.dependsOn(mobileDeviceTest)
-
+        androidUnitTest.dependsOn(mobileDeviceTest)
     }
 }
 
diff --git a/javascript/build.gradle.kts b/javascript/build.gradle.kts
@@ -7,26 +7,26 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     id("multiplatform-library-convention")
-    id("dev.icerock.mobile.multiplatform.android-manifest")
     id("publication-convention")
 }
 
 android {
+    namespace = "dev.icerock.moko.javascript"
     testOptions.unitTests.isIncludeAndroidResources = true
     defaultConfig {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     sourceSets {
-        getByName("androidTest").java.srcDirs(
+        getByName("test").java.srcDirs(
             file("src/androidAndroidTest/kotlin"),
             file("src/mobileDeviceTest/kotlin")
         )
     }
 }
 
 dependencies {
-    androidMainImplementation(libs.quickjs)
+    androidMainImplementation(libs.ziplineAndroid)
     commonMainImplementation(libs.kotlinSerialization)
     commonTestImplementation(libs.kotlinTest)
     commonTestImplementation(libs.kotlinTestAnnotations)
diff --git a/javascript/src/androidMain/AndroidManifest.xml b/javascript/src/androidMain/AndroidManifest.xml
diff --git a/javascript/src/androidMain/kotlin/dev/icerock/moko/javascript/ContextProvider.kt b/javascript/src/androidMain/kotlin/dev/icerock/moko/javascript/ContextProvider.kt
@@ -4,7 +4,9 @@
 
 package dev.icerock.moko.javascript
 
-internal interface ContextProvider {
+import app.cash.zipline.ZiplineService
+
+internal interface ContextProvider : ZiplineService {
     fun getBool(name: String): Boolean
     fun getDouble(name: String): Double
 
diff --git a/javascript/src/androidMain/kotlin/dev/icerock/moko/javascript/ContextProviderDynamic.kt b/javascript/src/androidMain/kotlin/dev/icerock/moko/javascript/ContextProviderDynamic.kt
@@ -4,6 +4,8 @@
 
 package dev.icerock.moko.javascript
 
+import java.util.Collections.emptyMap
+
 internal class ContextProviderDynamic : ContextProvider {
     var context: Map<String, JsType> = emptyMap()
     var activeScript: String = ""
diff --git a/javascript/src/androidMain/kotlin/dev/icerock/moko/javascript/JavaScriptEngine.kt b/javascript/src/androidMain/kotlin/dev/icerock/moko/javascript/JavaScriptEngine.kt
@@ -4,26 +4,30 @@
 
 package dev.icerock.moko.javascript
 
-import app.cash.quickjs.QuickJs
-import app.cash.quickjs.QuickJsException
+import app.cash.zipline.EngineApi
+import app.cash.zipline.QuickJsException
+import app.cash.zipline.Zipline
+import kotlinx.coroutines.Dispatchers
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 
+@OptIn(EngineApi::class)
 actual class JavaScriptEngine actual constructor() {
-    private val quickJs: QuickJs = QuickJs.create()
-    private val json: Json = Json.Default
+
+    private val json: Json = Json
     private val jsContext: ContextProviderDynamic = ContextProviderDynamic()
+    private val zipline: Zipline = Zipline.create(dispatcher = Dispatchers.IO)
 
     @Volatile
     var isClosed = false
         private set
 
     init {
-        quickJs.set("mokoJsContext", ContextProvider::class.java, jsContext)
-        quickJs.evaluate(
+        zipline.bind<ContextProvider>("mokoJsContext", jsContext)
+        zipline.quickJs.evaluate(
             """
                 function mokoJavaScriptProcessResult(result) {
                     if (typeof result === 'object') return JSON.stringify(result);
@@ -41,7 +45,7 @@ actual class JavaScriptEngine actual constructor() {
         val scriptWithContext: String = buildString {
             fillContext(scriptContext)
         }
-        quickJs.evaluate(scriptWithContext)
+        zipline.quickJs.evaluate(scriptWithContext)
     }
 
     actual fun evaluate(context: Map<String, JsType>, script: String): JsType {
@@ -56,7 +60,7 @@ actual class JavaScriptEngine actual constructor() {
 
     actual fun close() {
         if (isClosed) return
-        quickJs.close()
+        zipline.quickJs.close()
         isClosed = true
     }
 
@@ -71,7 +75,7 @@ actual class JavaScriptEngine actual constructor() {
             fillContext(context)
             append("mokoJavaScriptProcessResult(eval(mokoJsContext.getScript()));")
         }
-        val result: Any? = quickJs.evaluate(scriptWithContext)
+        val result: Any? = zipline.quickJs.evaluate(scriptWithContext)
         return handleQuickJsResult(result)
     }
 
@@ -104,9 +108,9 @@ actual class JavaScriptEngine actual constructor() {
                 val jsonElement: JsonElement = json.parseToJsonElement(result)
                 if (jsonElement is JsonObject || jsonElement is JsonArray) JsType.Json(jsonElement)
                 else JsType.Str(result)
-            } catch (ex: SerializationException) {
+            } catch (_: SerializationException) {
                 JsType.Str(result)
-            } catch (ex: IllegalStateException) {
+            } catch (_: IllegalStateException) {
                 JsType.Str(result)
             }
             else -> throw JavaScriptEvaluationException(
diff --git a/javascript/src/iosMain/kotlin/dev/icerock/moko/javascript/JavaScriptEngine.kt b/javascript/src/iosMain/kotlin/dev/icerock/moko/javascript/JavaScriptEngine.kt
@@ -4,6 +4,8 @@
 
 package dev.icerock.moko.javascript
 
+import kotlinx.cinterop.BetaInteropApi
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
@@ -94,22 +96,24 @@ actual class JavaScriptEngine actual constructor() {
     }
 }
 
+@OptIn(ExperimentalForeignApi::class, BetaInteropApi::class)
 private fun JsonObject.toNSDictionary(): NSDictionary {
     val data = NSString.create(string = this.toString()).dataUsingEncoding(NSUTF8StringEncoding)
         ?: return NSDictionary()
     return (NSJSONSerialization.JSONObjectWithData(
         data = data,
-        options = 0,
+        options = 0u,
         error = null
     ) as? NSDictionary) ?: NSDictionary()
 }
 
+@OptIn(ExperimentalForeignApi::class, BetaInteropApi::class)
 private fun JsonArray.toNSArray(): NSArray {
     val data = NSString.create(string = this.toString()).dataUsingEncoding(NSUTF8StringEncoding)
         ?: return NSArray()
     return (NSJSONSerialization.JSONObjectWithData(
         data = data,
-        options = 0,
+        options = 0u,
         error = null
     ) as? NSArray) ?: NSArray()
 }
diff --git a/javascript/src/mobileDeviceTest/kotlin/dev/icerock/moko/javascript/JavaScriptEngineCrossTypesTests.kt b/javascript/src/mobileDeviceTest/kotlin/dev/icerock/moko/javascript/JavaScriptEngineCrossTypesTests.kt
@@ -8,7 +8,6 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.encodeToJsonElement
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
-import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/sample/android-app/build.gradle.kts b/sample/android-app/build.gradle.kts
@@ -8,6 +8,7 @@ plugins {
 }
 
 android {
+    namespace = "com.icerockdev.app"
     defaultConfig {
         applicationId = "dev.icerock.moko.samples.javascript"
 
diff --git a/sample/android-app/src/main/AndroidManifest.xml b/sample/android-app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.icerockdev.app">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -10,7 +9,8 @@
         android:theme="@style/Theme.AppCompat.DayNight"
         tools:ignore="GoogleAppIndexingWarning">
 
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/sample/mpp-library/build.gradle.kts b/sample/mpp-library/build.gradle.kts
@@ -12,8 +12,14 @@ plugins {
 }
 
 kotlin {
-    android()
-    ios()
+    androidTarget()
+    iosArm64()
+    iosSimulatorArm64()
+    iosX64()
+}
+
+android {
+    namespace = "com.icerockdev.library"
 }
 
 dependencies {
diff --git a/sample/mpp-library/src/androidMain/AndroidManifest.xml b/sample/mpp-library/src/androidMain/AndroidManifest.xml
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ allprojects {`
`36`	`36`	`project build.gradle`
`37`	`37`	```groovy
`38`	`38`	`dependencies {`
`39`		`- commonMainApi("dev.icerock.moko:javascript:0.3.0")`
	`39`	`+ commonMainApi("dev.icerock.moko:javascript:0.4.0")`
`40`	`40`	`}`
`41`	`41`	```
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ repositories {`
`11`	`11`
`12`	`12`	`dependencies {`
`13`	`13`	`api("dev.icerock:mobile-multiplatform:0.14.1")`
`14`		`- api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")`
`15`		`- api("com.android.tools.build:gradle:7.0.1")`
	`14`	`+ api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")`
	`15`	`+ api("com.android.tools.build:gradle:8.12.3")`
`16`	`16`	`api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0")`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,6 @@ plugins {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`android {`
`12`		`- dexOptions {`
`13`		`- javaMaxHeapSize = "2g"`
`14`		`- }`
`15`		`-`
`16`	`12`	`buildTypes {`
`17`	`13`	`getByName("release") {`
`18`	`14`	`isMinifyEnabled = true`
`@@ -24,9 +20,13 @@ android {`
`24`	`20`	`}`
`25`	`21`	`}`
`26`	`22`
`27`		`- packagingOptions {`
`28`		`- exclude("META-INF/*.kotlin_module")`
`29`		`- exclude("META-INF/AL2.0")`
`30`		`- exclude("META-INF/LGPL2.1")`
	`23`	`+ packaging {`
	`24`	`+ resources {`
	`25`	`+ excludes += listOf(`
	`26`	`+ "META-INF/*.kotlin_module",`
	`27`	`+ "META-INF/AL2.0",`
	`28`	`+ "META-INF/LGPL2.1"`
	`29`	`+ )`
	`30`	`+ }`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@`
`5`	`5`	`import com.android.build.gradle.BaseExtension`
`6`	`6`
`7`	`7`	`configure<BaseExtension> {`
`8`		`- compileSdkVersion(30)`
	`8`	`+ compileSdkVersion(36)`
`9`	`9`
`10`	`10`	`defaultConfig {`
`11`		`- minSdkVersion(18)`
`12`		`- targetSdkVersion(30)`
	`11`	`+ minSdk = 18`
	`12`	`+ targetSdk = 36`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,26 +7,26 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent`
`7`	`7`
`8`	`8`	`plugins {`
`9`	`9`	`id("multiplatform-library-convention")`
`10`		`- id("dev.icerock.mobile.multiplatform.android-manifest")`
`11`	`10`	`id("publication-convention")`
`12`	`11`	`}`
`13`	`12`
`14`	`13`	`android {`
	`14`	`+ namespace = "dev.icerock.moko.javascript"`
`15`	`15`	`testOptions.unitTests.isIncludeAndroidResources = true`
`16`	`16`	`defaultConfig {`
`17`	`17`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`sourceSets {`
`21`		`- getByName("androidTest").java.srcDirs(`
	`21`	`+ getByName("test").java.srcDirs(`
`22`	`22`	`file("src/androidAndroidTest/kotlin"),`
`23`	`23`	`file("src/mobileDeviceTest/kotlin")`
`24`	`24`	`)`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`dependencies {`
`29`		`- androidMainImplementation(libs.quickjs)`
	`29`	`+ androidMainImplementation(libs.ziplineAndroid)`
`30`	`30`	`commonMainImplementation(libs.kotlinSerialization)`
`31`	`31`	`commonTestImplementation(libs.kotlinTest)`
`32`	`32`	`commonTestImplementation(libs.kotlinTestAnnotations)`