Update dependencies

rocka · rocka · commit 5dd2325a77ca · 2025-05-09T23:22:48.000+08:00
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
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
@@ -6,7 +6,6 @@
 package org.fcitx.fcitx5.android.input
 
 import android.annotation.SuppressLint
-import android.annotation.TargetApi
 import android.app.Dialog
 import android.content.res.ColorStateList
 import android.content.res.Configuration
@@ -581,7 +580,7 @@ class FcitxInputMethodService : LifecycleInputMethodService() {
         }
     }
 
-    @TargetApi(34)
+    @RequiresApi(34)
     override fun onUpdateEditorToolType(toolType: Int) {
         super.onUpdateEditorToolType(toolType)
         inputDeviceMgr.evaluateOnUpdateEditorToolType(toolType, this)
diff --git a/build-logic/convention/src/main/kotlin/AndroidAppConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidAppConventionPlugin.kt
@@ -17,6 +17,7 @@ import org.gradle.api.internal.provider.Providers
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import java.io.File
 
 /**
  * The prototype of an Android Application
@@ -141,13 +142,17 @@ class AndroidAppConventionPlugin : AndroidBaseConventionPlugin() {
         target.pluginManager.apply(target.libs.plugins.aboutlibraries.get().pluginId)
 
         target.configure<AboutLibrariesExtension> {
-            configPath = target.rootProject.relativePath(target.file("licenses"))
-            excludeFields = arrayOf(
-                "generated", "developers", "organization", "scm", "funding", "content"
-            )
-            fetchRemoteLicense = false
-            fetchRemoteFunding = false
-            includePlatform = false
+            collect {
+                configPath.set(File("licenses"))
+                fetchRemoteLicense.set(false)
+                fetchRemoteFunding.set(false)
+                includePlatform.set(false)
+            }
+            export {
+                excludeFields.set(
+                    setOf("generated", "developers", "organization", "scm", "funding", "content")
+                )
+            }
         }
 
         target.dependencies.add("coreLibraryDesugaring", target.libs.android.desugarJDKLibs)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,26 +1,26 @@
 [versions]
-androidGradlePlugin = "8.9.1"
+androidGradlePlugin = "8.10.0"
 kotlin = "2.1.20"
-ksp = "2.1.20-1.0.31"
-lifecycle = "2.8.7"
-navigation = "2.8.9"
-room = "2.6.1"
+ksp = "2.1.20-2.0.1"
+lifecycle = "2.9.0"
+navigation = "2.9.0"
+room = "2.7.1"
 splitties = "3.0.0"
-aboutlibraries = "11.6.3"
-arrow = "2.0.1"
+aboutlibraries = "12.1.2"
+arrow = "2.1.1"
 
 [libraries]
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
 android-desugarJDKLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version = "2.1.5" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
-kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version = "1.10.1" }
-kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.8.0" }
+kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version = "1.10.2" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.8.1" }
 androidx-activity = { module = "androidx.activity:activity-ktx", version = "1.10.1" }
 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.2.1" }
 androidx-coordinatorlayout = { module = "androidx.coordinatorlayout:coordinatorlayout", version = "1.3.0" }
-androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.15.0" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.16.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" }
@@ -71,4 +71,4 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlibraries" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
-gitVersion = { id = "com.palantir.git-version", version = "3.1.0" }
+gitVersion = { id = "com.palantir.git-version", version = "3.2.0" }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`package org.fcitx.fcitx5.android.input`
`7`	`7`
`8`	`8`	`import android.annotation.SuppressLint`
`9`		`-import android.annotation.TargetApi`
`10`	`9`	`import android.app.Dialog`
`11`	`10`	`import android.content.res.ColorStateList`
`12`	`11`	`import android.content.res.Configuration`
`@@ -581,7 +580,7 @@ class FcitxInputMethodService : LifecycleInputMethodService() {`
`581`	`580`	`}`
`582`	`581`	`}`
`583`	`582`
`584`		`- @TargetApi(34)`
	`583`	`+ @RequiresApi(34)`
`585`	`584`	`override fun onUpdateEditorToolType(toolType: Int) {`
`586`	`585`	`super.onUpdateEditorToolType(toolType)`
`587`	`586`	`inputDeviceMgr.evaluateOnUpdateEditorToolType(toolType, this)`