From 2b3755a09cf0865f839ed659cb974cdaa023ccb1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 19:25:23 +0000 Subject: [PATCH] Update dependency androidx.compose:compose-bom-alpha to v2026.04.00 (#2943) * Update dependency androidx.compose:compose-bom-alpha to v2026.04.00 * Fix deprecation * Update compileSdk version to 37 * Suppress deprecation warning for DnsResolver usage --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <99822064+revonateB0T@users.noreply.github.com> --- app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt | 4 ++-- app/src/main/kotlin/okhttp3/android/AndroidAsyncDns.kt | 1 + gradle/libs.versions.toml | 2 +- settings.gradle.kts | 6 +----- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt index b8c522f4e..061f19dc5 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt @@ -66,7 +66,7 @@ import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.SnackbarResult import androidx.compose.material3.Text -import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo +import androidx.compose.material3.adaptive.currentWindowAdaptiveInfoV2 import androidx.compose.material3.rememberDrawerState import androidx.compose.material3.rememberDrawerState2 import androidx.compose.runtime.Composable @@ -380,7 +380,7 @@ class MainActivity : AppCompatActivity() { var snackbarFabPadding by remember { mutableStateOf(0.dp) } val drawerEnabled = drawerHandle.isNotEmpty() val density = LocalDensity.current - val adaptiveInfo = currentWindowAdaptiveInfo() + val adaptiveInfo = currentWindowAdaptiveInfoV2() val needSignIn by Settings.needSignIn.collectAsState() val launchPage by Settings.launchPage.collectAsState() CompositionLocalProvider( diff --git a/app/src/main/kotlin/okhttp3/android/AndroidAsyncDns.kt b/app/src/main/kotlin/okhttp3/android/AndroidAsyncDns.kt index 8cee35c63..0ed608899 100644 --- a/app/src/main/kotlin/okhttp3/android/AndroidAsyncDns.kt +++ b/app/src/main/kotlin/okhttp3/android/AndroidAsyncDns.kt @@ -40,6 +40,7 @@ class AndroidAsyncDns( private val network: Network? = null, ) : AsyncDns { @RequiresApi(Build.VERSION_CODES.Q) + @Suppress("DEPRECATION") internal val resolver = DnsResolver.getInstance() private val executor = Executors.newSingleThreadExecutor() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 757191d12..d65896373 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ androidx-webkit = "1.15.0" androidx-work = "2.11.2" arrow = "2.2.2.1" coil = "3.4.0" -compose-bom = "2026.03.01" +compose-bom = "2026.04.00" compose-multiplatform = "1.10.3" compose-destinations = "2.3.0" compose-preference = "2.2.0" diff --git a/settings.gradle.kts b/settings.gradle.kts index acc8e4262..028b995a4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -32,11 +32,7 @@ plugins { } android { - compileSdk { - version = release(36) { - minorApiLevel = 1 - } - } + compileSdk = 37 minSdk = 23 targetSdk = 36 ndkVersion = "29.0.14206865"