Merge pull request #220 from KevinnZou/feature/cmp_170_beta

Feature/cmp 170 beta
KevinnZou · Sep 11, 2024 · ef0694c · ef0694c
2 parents d6b0e95 + c34d005
commit ef0694c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git 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

diff --git 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
@@ -14,7 +15,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
@@ -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 {

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
@@ -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,
+            ),
     )
 }