Skip to content

Commit da909f9

Browse files
WhiredPlanckWhiredPlanck
committed
chore: update dependency
AGP 8.13.1 KSP 2.3.2, turn on ksp.useKSP2 Kotlin 2.2.21
1 parent 349f945 commit da909f9

File tree

7 files changed

+57
-55
lines changed

7 files changed

+57
-55
lines changed

‎app/src/main/java/com/osfans/trime/ime/candidates/compact/CompactCandidateViewAdapter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ open class CompactCandidateViewAdapter(
3939
total: Int,
4040
highlightedIndex: Int,
4141
) {
42-
super.submitList(data.toList())
42+
super.submitList(data.toList(), null)
4343
this.total = total
4444
this.highlightedIdx = highlightedIndex
4545
}

‎app/src/main/java/com/osfans/trime/ime/symbol/LiquidTabsUi.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ class LiquidTabsUi(
104104
}
105105
}
106106

107-
override fun submitList(list: List<LiquidData.Tag>?) {
107+
override fun submitList(list: List<LiquidData.Tag>?, commitCallback: Runnable?) {
108108
selected = -1
109-
super.submitList(list)
109+
super.submitList(list, commitCallback)
110110
}
111111

112112
fun activateTab(position: Int) {

‎app/src/main/java/com/osfans/trime/ui/main/LicenseFragment.kt‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import androidx.lifecycle.lifecycleScope
1414
import androidx.preference.Preference
1515
import com.mikepenz.aboutlibraries.Libs
1616
import com.mikepenz.aboutlibraries.entity.License
17-
import com.mikepenz.aboutlibraries.util.withJson
1817
import com.osfans.trime.R
1918
import com.osfans.trime.ui.common.PaddingPreferenceFragment
2019
import kotlinx.coroutines.launch
@@ -28,27 +27,30 @@ class LicenseFragment : PaddingPreferenceFragment() {
2827
) {
2928
lifecycleScope.launch {
3029
val context = preferenceManager.context
31-
val screen = preferenceManager.createPreferenceScreen(context)
32-
Libs
33-
.Builder()
34-
.withJson(context, R.raw.aboutlibraries)
35-
.build()
36-
.libraries
37-
.sortedBy {
38-
if (it.tag == "native") it.uniqueId.uppercase() else it.uniqueId.lowercase()
39-
}.forEach {
40-
screen.addPreference(
41-
Preference(context).apply {
42-
isIconSpaceReserved = false
43-
title = "${it.uniqueId}:${it.artifactVersion}"
44-
summary = it.licenses.joinToString { l -> l.spdxId ?: l.name }
45-
setOnPreferenceClickListener { _ ->
46-
showLicenseDialog(it.uniqueId, it.licenses)
47-
}
48-
},
49-
)
50-
}
51-
preferenceScreen = screen
30+
preferenceScreen = preferenceManager.createPreferenceScreen(requireContext()).apply {
31+
val jsonString = resources.openRawResource(R.raw.aboutlibraries)
32+
.bufferedReader()
33+
.use { it.readText() }
34+
Libs
35+
.Builder()
36+
.withJson(jsonString)
37+
.build()
38+
.libraries
39+
.sortedBy {
40+
if (it.tag == "native") it.uniqueId.uppercase() else it.uniqueId.lowercase()
41+
}.forEach {
42+
addPreference(
43+
Preference(context).apply {
44+
isIconSpaceReserved = false
45+
title = "${it.uniqueId}:${it.artifactVersion}"
46+
summary = it.licenses.joinToString { l -> l.spdxId ?: l.name }
47+
setOnPreferenceClickListener { _ ->
48+
showLicenseDialog(it.uniqueId, it.licenses)
49+
}
50+
},
51+
)
52+
}
53+
}
5254
}
5355
}
5456

‎app/src/main/java/com/osfans/trime/ui/main/settings/schema/SchemaListAdapter.kt‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import com.osfans.trime.ui.common.OnItemChangedListener
1919
import com.osfans.trime.ui.main.MainViewModel
2020

2121
open class SchemaListAdapter(
22-
override var items: List<SchemaItem>,
23-
) : BaseQuickAdapter<SchemaItem, SchemaListAdapter.ViewHolder>() {
22+
items: List<SchemaItem>,
23+
) : BaseQuickAdapter<SchemaItem, SchemaListAdapter.ViewHolder>(items) {
2424
var multiselect = false
2525
private set
2626

@@ -144,32 +144,29 @@ open class SchemaListAdapter(
144144
}
145145

146146
@CallSuper
147-
override fun add(data: SchemaItem) {
148-
super.add(data)
147+
override fun add(data: SchemaItem, commitCallback: Runnable?) {
148+
super.add(data, commitCallback)
149149
addInternal(items.size, data)
150150
}
151151

152152
@CallSuper
153-
override fun add(
154-
position: Int,
155-
data: SchemaItem,
156-
) {
157-
super.add(position, data)
153+
override fun add(position: Int, data: SchemaItem, commitCallback: Runnable?) {
154+
super.add(position, data, commitCallback)
158155
addInternal(position, data)
159156
}
160157

161158
@CallSuper
162-
override fun addAll(collection: Collection<SchemaItem>) {
163-
super.addAll(collection)
159+
override fun addAll(collection: Collection<SchemaItem>, commitCallback: Runnable?) {
160+
super.addAll(collection, commitCallback)
164161
listener?.onItemAddedBatch(collection.toList())
165162
mainViewModel?.showToolbarEditButton()
166163
}
167164

168165
/** This also valid for [BaseQuickAdapter.remove] */
169166
@CallSuper
170-
override fun removeAt(position: Int) {
167+
override fun removeAt(position: Int, commitCallback: Runnable?) {
171168
listener?.onItemRemoved(position, items[position])
172-
super.removeAt(position)
169+
super.removeAt(position, commitCallback)
173170
if (items.isEmpty()) {
174171
mainViewModel?.hideToolbarEditButton()
175172
}

‎app/src/main/java/com/osfans/trime/ui/main/settings/userdict/UserDictListAdapter.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import androidx.recyclerview.widget.RecyclerView
1212
import com.chad.library.adapter4.BaseQuickAdapter
1313

1414
class UserDictListAdapter(
15-
override var items: List<String>,
15+
items: List<String>,
1616
val initMoreButton: (ImageButton.(String) -> Unit) = {},
17-
) : BaseQuickAdapter<String, UserDictListAdapter.ViewHolder>() {
17+
) : BaseQuickAdapter<String, UserDictListAdapter.ViewHolder>(items) {
1818

19-
inner class ViewHolder(
19+
class ViewHolder(
2020
ui: UserDictListEntryUi,
2121
) : RecyclerView.ViewHolder(ui.root) {
2222
val nameText = ui.nameText

‎gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ android.useAndroidX=true
88

99
# enlarge heap size to 2GB
1010
org.gradle.jvmargs=-Xmx2048M -XX:+HeapDumpOnOutOfMemoryError
11+
12+
# KSP2 https://github.com/google/ksp/blob/main/docs/ksp2.md
13+
ksp.useKSP2=true

‎gradle/libs.versions.toml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
[versions]
2-
androidGradlePlugin = "8.11.0"
3-
kotlin = "2.2.0"
4-
ksp = "2.2.0-2.0.2"
5-
navigation = "2.8.5"
2+
androidGradlePlugin = "8.13.1"
3+
kotlin = "2.2.21"
4+
ksp = "2.3.2"
5+
navigation = "2.9.6"
66
room = "2.7.2"
77
splitties = "3.0.0"
8-
aboutlibraries = "12.2.3"
9-
kotest = "5.8.0"
8+
aboutlibraries = "13.1.0"
9+
kotest = "6.0.7"
1010
kotlin-inject = "0.8.0"
1111
iconics = "5.4.0"
1212

1313
[libraries]
1414
android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
1515
kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
1616
kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version = "1.10.2" }
17-
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.8.1" }
17+
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.9.0" }
1818
androidx-activity = { module = "androidx.activity:activity-ktx", version = "1.10.1" }
1919
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
2020
androidx-autofill = { module = "androidx.autofill:autofill", version ="1.3.0"}
21-
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.0" }
22-
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.15.0" }
21+
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" }
22+
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.16.0" }
2323
androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation" }
2424
androidx-navigation-ui = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" }
25-
androidx-paging-runtime-ktx = { group = "androidx.paging", name = "paging-runtime-ktx", version = "3.3.5" }
25+
androidx-paging-runtime-ktx = { group = "androidx.paging", name = "paging-runtime-ktx", version = "3.3.6" }
2626
androidx-preference = { module = "androidx.preference:preference-ktx", version = "1.2.1" }
2727
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.4.0" }
2828
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
@@ -32,8 +32,8 @@ androidx-room-paging = { module = "androidx.room:room-paging", version.ref = "ro
3232
androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version = "1.1.0" }
3333
androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version = "2.9.1" }
3434
flexbox = { module = "com.google.android.flexbox:flexbox", version = "3.0.0" }
35-
bravh = { module = "io.github.cymchad:BaseRecyclerViewAdapterHelper4", version = "4.1.7" }
36-
kaml = { module = "com.charleskorn.kaml:kaml", version = "0.83.0" }
35+
bravh = { module = "io.github.cymchad:BaseRecyclerViewAdapterHelper4", version = "4.3.2" }
36+
kaml = { module = "com.charleskorn.kaml:kaml", version = "0.104.0" }
3737
timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" }
3838
xxpermissions = { module = "com.github.getActivity:XXPermissions", version = "18.5" }
3939
iconics-core = { module = "com.mikepenz:iconics-core", version.ref = "iconics" }
@@ -60,7 +60,7 @@ android-library = { id = "com.android.library", version.ref = "androidGradlePlug
6060
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
6161
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
6262
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
63-
aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlibraries" }
63+
aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin.android", version.ref = "aboutlibraries" }
6464
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
6565
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
66-
spotless = { id = "com.diffplug.spotless", version = "7.0.2" }
66+
spotless = { id = "com.diffplug.spotless", version = "8.1.0" }

0 commit comments

Comments
 (0)