Skip to content

Commit 2cb2785

Browse files
committed
✨ 适配 Android 16kb page size 完成,正式全面更新到kotlin2.0
1 parent 5201276 commit 2cb2785

6 files changed

Lines changed: 46 additions & 25 deletions

File tree

next/kmp/buildSrc/src/main/kotlin/target-android-ios-ffi.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import org.gradle.accessors.dm.LibrariesForLibs
2-
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
32

43
plugins {
54
id("target-common")
@@ -10,11 +9,6 @@ plugins {
109
val libs = the<LibrariesForLibs>()
1110

1211
kotlin {
13-
@OptIn(ExperimentalKotlinGradlePluginApi::class)
14-
compilerOptions {
15-
languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
16-
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
17-
}
1812
kmpCommonTarget(project) {
1913
dependencies {
2014
implementation(libs.squareup.okio)

next/kmp/buildSrc/src/main/kotlin/target-desktop-ffi.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ plugins {
1010
val libs = the<LibrariesForLibs>()
1111

1212
kotlin {
13-
// @OptIn(ExperimentalKotlinGradlePluginApi::class)
14-
// compilerOptions {
15-
// languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
16-
// apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
17-
// }
1813
kmpCommonTarget(project) {
1914
dependencies {
2015
implementation(libs.squareup.okio)

next/kmp/buildSrc/src/main/kotlin/target-desktop-ios-ffi.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import org.gradle.accessors.dm.LibrariesForLibs
32
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
43

@@ -10,11 +9,6 @@ plugins {
109
val libs = the<LibrariesForLibs>()
1110

1211
kotlin {
13-
@OptIn(ExperimentalKotlinGradlePluginApi::class)
14-
compilerOptions {
15-
languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
16-
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
17-
}
1812
kmpCommonTarget(project) {
1913
dependencies {
2014
implementation(libs.squareup.okio)

next/kmp/dwebview/src/androidMain/kotlin/org/dweb_browser/dwebview/DWebProfile.android.kt

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
package org.dweb_browser.dwebview
22

33

4+
import android.os.CancellationSignal
45
import android.webkit.CookieManager
56
import android.webkit.GeolocationPermissions
67
import android.webkit.ServiceWorkerController
78
import android.webkit.WebStorage
9+
import androidx.webkit.OutcomeReceiverCompat
10+
import androidx.webkit.PrefetchException
811
import androidx.webkit.Profile
12+
import androidx.webkit.SpeculativeLoadingConfig
13+
import androidx.webkit.SpeculativeLoadingParameters
914
import kotlinx.coroutines.Job
15+
import java.util.concurrent.Executor
1016

1117

18+
@Profile.ExperimentalUrlPrefetch
1219
class CompactDWebProfile internal constructor(override val profileName: ProfileName) : Profile,
1320
DWebProfile {
1421

@@ -34,4 +41,35 @@ class CompactDWebProfile internal constructor(override val profileName: ProfileN
3441
override fun getServiceWorkerController(): ServiceWorkerController {
3542
return CompactDWebProfileStore.serviceWorkerController
3643
}
44+
45+
override fun prefetchUrlAsync(
46+
url: String,
47+
cancellationSignal: CancellationSignal?,
48+
callbackExecutor: Executor,
49+
operationCallback: OutcomeReceiverCompat<Void?, PrefetchException?>
50+
) {
51+
52+
}
53+
54+
override fun prefetchUrlAsync(
55+
url: String,
56+
cancellationSignal: CancellationSignal?,
57+
callbackExecutor: Executor,
58+
speculativeLoadingParameters: SpeculativeLoadingParameters,
59+
operationCallback: OutcomeReceiverCompat<Void?, PrefetchException?>
60+
) {
61+
62+
}
63+
64+
override fun clearPrefetchAsync(
65+
url: String,
66+
callbackExecutor: Executor,
67+
operationCallback: OutcomeReceiverCompat<Void?, PrefetchException?>
68+
) {
69+
70+
}
71+
72+
override fun setSpeculativeLoadingConfig(speculativeLoadingConfig: SpeculativeLoadingConfig) {
73+
74+
}
3775
}

next/kmp/gradle/libs.versions.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jvmTarget = "17"
1010
javaVersion = "VERSION_17" # JavaVersion.VERSION_17
1111
ksp = "2.1.20-Beta2-1.0.30"
1212

13-
agp = "8.8.2"
13+
agp = "8.9.0"
1414
androidx-baselineprofile-version = "1.3.3"
1515
kotlin-version = "2.1.20-Beta2"
1616
kotlin-serialization-gradle = "2.1.20-Beta2"
@@ -20,14 +20,14 @@ androidx-test-runner = "1.6.2"
2020
androidx-compose-ui-test = "1.7.8"
2121
androidx-compose-ui = "1.6.7"
2222
androidx-lifecycle = "2.8.7"
23-
compose-bom = "2025.02.00"
23+
compose-bom = "2025.03.00"
2424

25-
androidx-activity = "1.10.0"
25+
androidx-activity = "1.10.1"
2626
androidx-appcompat = "1.7.0"
2727
androidx-core-ktx = "1.15.0"
2828
androidx-core-splashscreen = "1.1.0-rc01"
2929
androidx-annotation = "1.9.1"
30-
androidx-navigation-ui-kotlin = "2.8.7"
30+
androidx-navigation-ui-kotlin = "2.8.9"
3131
androidx-gridlayout = "1.0.0"
3232
androidx-profile-installer = "1.4.1"
3333
androidx-biometric = "1.4.0-alpha02"
@@ -67,7 +67,7 @@ jxbrowser-gradle = "1.2.1"
6767

6868
# jna
6969
java-jna-version = "5.17.0"
70-
webkit = "1.12.1"
70+
webkit = "1.13.0"
7171

7272
junit = "1.2.1"
7373
espresso = "3.6.1"
@@ -78,7 +78,7 @@ log4j12 = "2.0.12"
7878

7979
filekit = "0.8.0"
8080

81-
dweb-version = "1.2.0"
81+
dweb-version = "1.2.1"
8282

8383
[libraries]
8484

next/kmp/settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ pluginManagement {
2020
}
2121
}
2222
dependencies {
23-
classpath("com.android.tools:r8:8.8.27") // R8 是 Android 构建工具链的一部分,用于替代 ProGuard : 代码缩减/类重命名和优化/性能优化
23+
classpath("com.android.tools:r8:8.9.27") // R8 是 Android 构建工具链的一部分,用于替代 ProGuard : 代码缩减/类重命名和优化/性能优化
2424
}
2525
}
2626
}
2727
plugins {
28-
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
28+
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.9.0")
2929
}
3030

3131
@Suppress("UnstableApiUsage")

0 commit comments

Comments
 (0)