Target SDK 35 and migrate deprecations

rocka · rocka · commit 8ed5609b1371 · 2024-11-04T02:03:48.000+08:00
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/core/Fcitx.kt b/app/src/main/java/org/fcitx/fcitx5/android/core/Fcitx.kt
@@ -403,8 +403,10 @@ class Fcitx(private val context: Context) : FcitxAPI, FcitxLifecycleOwner {
             val libraryNames = arrayListOf<String>()
             val libraryDependency = arrayListOf<Array<String>>()
             plugins.forEach {
-                nativeLibDir.append(':')
-                nativeLibDir.append(it.nativeLibraryDir)
+                if (it.nativeLibraryDir.isNotBlank()) {
+                    nativeLibDir.append(':')
+                    nativeLibDir.append(it.nativeLibraryDir)
+                }
                 it.domain?.let { d ->
                     extDomains.add(d)
                 }
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/core/data/DataManager.kt b/app/src/main/java/org/fcitx/fcitx5/android/core/data/DataManager.kt
@@ -183,8 +183,8 @@ object DataManager {
                             domain,
                             description,
                             hasService,
-                            info.versionName,
-                            info.applicationInfo.nativeLibraryDir,
+                            info.versionName ?: "",
+                            info.applicationInfo?.nativeLibraryDir ?: "",
                             libraryDependency
                         )
                     )
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/FcitxInputMethodService.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/FcitxInputMethodService.kt
@@ -150,6 +150,13 @@ class FcitxInputMethodService : LifecycleInputMethodService() {
                 shouldUpdateNavbarForeground = true
                 shouldUpdateNavbarBackground = false
                 WindowCompat.setDecorFitsSystemWindows(w, false)
+                /**
+                 * Why on earth does it deprecated? It says
+                 * https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-15.0.0_r3/core/java/android/view/Window.java#2720
+                 * "If the app targets VANILLA_ICE_CREAM or above, the color will be transparent and cannot be changed"
+                 * but actually not.
+                 */
+                @Suppress("DEPRECATION")
                 w.navigationBarColor = Color.TRANSPARENT
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                     // don't apply scrim to transparent navigation bar
@@ -479,6 +486,7 @@ class FcitxInputMethodService : LifecycleInputMethodService() {
                 .isAppearanceLightNavigationBars = !theme.isDark
         }
         if (shouldUpdateNavbarBackground) {
+            @Suppress("DEPRECATION")
             w.navigationBarColor = when (theme) {
                 is Theme.Builtin -> if (keyBorder) theme.backgroundColor else theme.keyboardColor
                 is Theme.Custom -> theme.backgroundColor
diff --git a/build-logic/convention/src/main/kotlin/Versions.kt b/build-logic/convention/src/main/kotlin/Versions.kt
@@ -7,13 +7,13 @@ import org.gradle.api.JavaVersion
 object Versions {
 
     val java = JavaVersion.VERSION_11
-    const val compileSdk = 34
+    const val compileSdk = 35
     const val minSdk = 23
-    const val targetSdk = 34
+    const val targetSdk = 35
 
     const val defaultCMake = "3.22.1"
     const val defaultNDK = "25.2.9519653"
-    const val defaultBuildTools = "34.0.0"
+    const val defaultBuildTools = "35.0.0"
 
     // NOTE: increase this value to bump version code
     const val baseVersionCode = 7
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-androidGradlePlugin = "8.7.0"
+androidGradlePlugin = "8.7.2"
 androidDesugarJDKLibs = "2.1.2"
 kotlin = "2.0.20"
 ksp = "2.0.20-1.0.25"
-lifecycle = "2.8.6"
-navigation = "2.8.2"
+lifecycle = "2.8.7"
+navigation = "2.8.3"
 room = "2.6.1"
 splitties = "3.0.0"
 aboutlibraries = "11.2.3"
@@ -15,12 +15,12 @@ android-desugarJDKLibs = { group = "com.android.tools", name = "desugar_jdk_libs
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version = "1.9.0" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.6.3" }
-androidx-activity = { module = "androidx.activity:activity-ktx", version = "1.9.2" }
+androidx-activity = { module = "androidx.activity:activity-ktx", version = "1.9.3" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
 androidx-autofill = { module = "androidx.autofill:autofill", version = "1.1.0" }
-androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.1.4" }
+androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.0" }
 androidx-coordinatorlayout = { module = "androidx.coordinatorlayout:coordinatorlayout", version = "1.2.0" }
-androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.13.1" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.15.0" }
 androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,8 @@ object DataManager {`
`183`	`183`	`domain,`
`184`	`184`	`description,`
`185`	`185`	`hasService,`
`186`		`- info.versionName,`
`187`		`- info.applicationInfo.nativeLibraryDir,`
	`186`	`+ info.versionName ?: "",`
	`187`	`+ info.applicationInfo?.nativeLibraryDir ?: "",`
`188`	`188`	`libraryDependency`
`189`	`189`	`)`
`190`	`190`	`)`