From 7e5a9684c7689a958ee6e729b67f28e77a0e98f6 Mon Sep 17 00:00:00 2001 From: kevinzou Date: Sat, 7 Sep 2024 21:38:10 +0800 Subject: [PATCH 1/4] feat:Upgrade CMP version to 1.7.0-beta01 --- gradle.properties | 2 +- sample/shared/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3df902f4..1bd08366 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ android.minSdk=21 #Versions kotlin.version=1.9.23 agp.version=8.1.1 -compose.version=1.6.1 +compose.version=1.7.0-beta01 coroutines.version=1.8.0 GROUP=io.github.kevinnzou POM_ARTIFACT_ID=compose-webview-multiplatform diff --git a/sample/shared/build.gradle.kts b/sample/shared/build.gradle.kts index a1b190d9..c10990a7 100644 --- a/sample/shared/build.gradle.kts +++ b/sample/shared/build.gradle.kts @@ -48,7 +48,7 @@ kotlin { implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") implementation("org.jetbrains.kotlinx:atomicfu:0.23.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") - implementation("org.jetbrains.androidx.navigation:navigation-compose:2.7.0-alpha03") + implementation("org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha08") } } val androidMain by getting { From 2c591286dc1ff180b2682a8d61ca7ed3531ff269 Mon Sep 17 00:00:00 2001 From: kevinzou Date: Sat, 7 Sep 2024 21:39:18 +0800 Subject: [PATCH 2/4] feat:UIKitView migration --- .../kotlin/com/multiplatform/webview/web/WebView.ios.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webview/src/iosMain/kotlin/com/multiplatform/webview/web/WebView.ios.kt b/webview/src/iosMain/kotlin/com/multiplatform/webview/web/WebView.ios.kt index f47ceb65..59affeb8 100644 --- a/webview/src/iosMain/kotlin/com/multiplatform/webview/web/WebView.ios.kt +++ b/webview/src/iosMain/kotlin/com/multiplatform/webview/web/WebView.ios.kt @@ -4,7 +4,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier -import androidx.compose.ui.interop.UIKitView +import androidx.compose.ui.viewinterop.UIKitInteropProperties +import androidx.compose.ui.viewinterop.UIKitView import com.multiplatform.webview.jsbridge.WebViewJsBridge import com.multiplatform.webview.util.toUIColor import kotlinx.cinterop.ExperimentalForeignApi @@ -142,5 +143,10 @@ fun IOSWebView( it.navigationDelegate = null onDispose(it) }, + properties = + UIKitInteropProperties( + isInteractive = true, + isNativeAccessibilityEnabled = true, + ), ) } From 7a42863026fe472194b61c4e58f0078e43bb331b Mon Sep 17 00:00:00 2001 From: kevinzou Date: Sun, 8 Sep 2024 09:44:54 +0800 Subject: [PATCH 3/4] feat:iosArm64 disable cache --- gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle.properties b/gradle.properties index 1bd08366..b8e24e70 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,7 @@ org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" #Kotlin kotlin.code.style=official +kotlin.native.cacheKind.iosArm64=none #MPP kotlin.mpp.stability.nowarn=true kotlin.mpp.enableCInteropCommonization=true From c34d005c32cf4ae2fc5f0eb028c5d33d846e44a7 Mon Sep 17 00:00:00 2001 From: kevinzou Date: Wed, 11 Sep 2024 20:39:40 +0800 Subject: [PATCH 4/4] feat:upgrade to macos 14 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2d51b20..4b43298d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,8 +11,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, macos-12, windows-2022] - gradle: [8.3] + os: [ ubuntu-20.04, macos-14, windows-2022 ] + gradle: [ 8.3 ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3