Skip to content

Commit ef0694c

Browse files
authored
Merge pull request #220 from KevinnZou/feature/cmp_170_beta
Feature/cmp 170 beta
2 parents d6b0e95 + c34d005 commit ef0694c

4 files changed

Lines changed: 12 additions & 5 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os: [ubuntu-20.04, macos-12, windows-2022]
15-
gradle: [8.3]
14+
os: [ ubuntu-20.04, macos-14, windows-2022 ]
15+
gradle: [ 8.3 ]
1616
runs-on: ${{ matrix.os }}
1717
steps:
1818
- uses: actions/checkout@v3

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
33
#Kotlin
44
kotlin.code.style=official
5+
kotlin.native.cacheKind.iosArm64=none
56
#MPP
67
kotlin.mpp.stability.nowarn=true
78
kotlin.mpp.enableCInteropCommonization=true
@@ -14,7 +15,7 @@ android.minSdk=21
1415
#Versions
1516
kotlin.version=1.9.23
1617
agp.version=8.1.1
17-
compose.version=1.6.1
18+
compose.version=1.7.0-beta01
1819
coroutines.version=1.8.0
1920
GROUP=io.github.kevinnzou
2021
POM_ARTIFACT_ID=compose-webview-multiplatform

sample/shared/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ kotlin {
4848
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
4949
implementation("org.jetbrains.kotlinx:atomicfu:0.23.2")
5050
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
51-
implementation("org.jetbrains.androidx.navigation:navigation-compose:2.7.0-alpha03")
51+
implementation("org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha08")
5252
}
5353
}
5454
val androidMain by getting {

webview/src/iosMain/kotlin/com/multiplatform/webview/web/WebView.ios.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import androidx.compose.runtime.Composable
44
import androidx.compose.runtime.remember
55
import androidx.compose.runtime.rememberCoroutineScope
66
import androidx.compose.ui.Modifier
7-
import androidx.compose.ui.interop.UIKitView
7+
import androidx.compose.ui.viewinterop.UIKitInteropProperties
8+
import androidx.compose.ui.viewinterop.UIKitView
89
import com.multiplatform.webview.jsbridge.WebViewJsBridge
910
import com.multiplatform.webview.util.toUIColor
1011
import kotlinx.cinterop.ExperimentalForeignApi
@@ -142,5 +143,10 @@ fun IOSWebView(
142143
it.navigationDelegate = null
143144
onDispose(it)
144145
},
146+
properties =
147+
UIKitInteropProperties(
148+
isInteractive = true,
149+
isNativeAccessibilityEnabled = true,
150+
),
145151
)
146152
}

0 commit comments

Comments
 (0)