Modernize toolchain: Kotlin 2.3.10 + KSP2, sora-editor 0.24.6, drop abandoned deps

app/build.gradle.kts

@@ -13,10 +13,6 @@ android {
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
     }
-    ksp {
-        arg("room.incremental", "true")
-        arg("room.schemaLocation", "$projectDir/schemas")
-    }
     bundle {
         language {
             enableSplit = false
@@ -38,6 +34,14 @@ android {
     }
 }
 
+// KSP options (room schema export). The `ksp { }` extension is registered by the KSP Gradle
+// plugin at the project level, not inside the Android DSL, so it is declared as a top-level
+// block here.
+ksp {
+    arg("room.incremental", "true")
+    arg("room.schemaLocation", "$projectDir/schemas")
+}
+
 dependencies {
 
     implementation(fileTree("libs"))
@@ -76,7 +80,7 @@ dependencies {
     // widget; it replaces the archived com.blacksquircle.ui:editorkit. Syntax highlighting
     // is provided via TextMate grammars (language-textmate), with JSON grammar + themes
     // bundled in assets/textmate/. Versions are managed by the editor-bom platform.
-    implementation(platform("io.github.rosemoe:editor-bom:0.23.7"))
+    implementation(platform("io.github.rosemoe:editor-bom:0.24.6"))
     implementation("io.github.rosemoe:editor")
     implementation("io.github.rosemoe:language-textmate")
 
@@ -87,16 +91,11 @@ dependencies {
     implementation("com.google.guava:guava:33.4.0-android")
     implementation("org.ini4j:ini4j:0.5.4")
 
-    implementation("com.simplecityapps:recyclerview-fastscroll:2.0.1") {
-        exclude(group = "androidx.recyclerview")
-        exclude(group = "androidx.appcompat")
-    }
+    implementation("me.zhanghai.android.fastscroll:library:1.3.0")
 
     implementation("androidx.room:room-runtime:2.7.2")
     ksp("androidx.room:room-compiler:2.7.2")
     implementation("androidx.room:room-ktx:2.7.2")
-    implementation("com.github.MatrixDev.Roomigrant:RoomigrantLib:0.3.4")
-    ksp("com.github.MatrixDev.Roomigrant:RoomigrantCompiler:0.3.4")
 
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
 }

app/src/main/java/io/nekohasekai/sagernet/database/SagerDatabase.kt

@@ -5,7 +5,6 @@ import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import dev.matrix.roomigrant.GenerateRoomMigrations
 import io.nekohasekai.sagernet.Key
 import io.nekohasekai.sagernet.SagerNet
 import io.nekohasekai.sagernet.fmt.KryoConverters
@@ -26,7 +25,6 @@ import kotlinx.coroutines.launch
     ]
 )
 @TypeConverters(value = [KryoConverters::class, GsonConverters::class])
-@GenerateRoomMigrations
 abstract class SagerDatabase : RoomDatabase() {
 
     companion object {
@@ -35,7 +33,6 @@ abstract class SagerDatabase : RoomDatabase() {
         val instance by lazy {
             SagerNet.application.getDatabasePath(Key.DB_PROFILE).parentFile?.mkdirs()
             Room.databaseBuilder(SagerNet.application, SagerDatabase::class.java, Key.DB_PROFILE)
-//                .addMigrations(*SagerDatabase_Migrations.build())
                 .setJournalMode(JournalMode.TRUNCATE)
                 .allowMainThreadQueries()
                 .enableMultiInstanceInvalidation()

app/src/main/java/io/nekohasekai/sagernet/database/preference/PublicDatabase.kt

@@ -3,14 +3,12 @@ package io.nekohasekai.sagernet.database.preference
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
-import dev.matrix.roomigrant.GenerateRoomMigrations
 import io.nekohasekai.sagernet.Key
 import io.nekohasekai.sagernet.SagerNet
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 
 @Database(entities = [KeyValuePair::class], version = 1)
-@GenerateRoomMigrations
 abstract class PublicDatabase : RoomDatabase() {
     companion object {
         val instance by lazy {

app/src/main/java/io/nekohasekai/sagernet/ui/AppListActivity.kt

@@ -23,7 +23,8 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.snackbar.Snackbar
-import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+import me.zhanghai.android.fastscroll.FastScrollerBuilder
+import me.zhanghai.android.fastscroll.PopupTextProvider
 import io.nekohasekai.sagernet.BuildConfig
 import io.nekohasekai.sagernet.R
 import io.nekohasekai.sagernet.SagerNet
@@ -97,7 +98,7 @@ class AppListActivity : ThemedActivity() {
 
     private inner class AppsAdapter : RecyclerView.Adapter<AppViewHolder>(),
         Filterable,
-        FastScrollRecyclerView.SectionedAdapter {
+        PopupTextProvider {
         var filteredApps = apps
 
         suspend fun reload() {
@@ -146,7 +147,7 @@ class AppListActivity : ThemedActivity() {
 
         override fun getFilter(): Filter = filterImpl
 
-        override fun getSectionName(position: Int): String {
+        override fun getPopupText(view: View, position: Int): CharSequence {
             return filteredApps[position].name.firstOrNull()?.toString() ?: ""
         }
 
@@ -214,6 +215,7 @@ class AppListActivity : ThemedActivity() {
         binding.list.layoutManager = LinearLayoutManager(this, RecyclerView.VERTICAL, false)
         binding.list.itemAnimator = DefaultItemAnimator()
         binding.list.adapter = appsAdapter
+        FastScrollerBuilder(binding.list).useMd2Style().build()
 
         ViewCompat.setOnApplyWindowInsetsListener(binding.root, ListListener)
 

app/src/main/java/io/nekohasekai/sagernet/ui/AppManagerActivity.kt

@@ -24,7 +24,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
-import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+import me.zhanghai.android.fastscroll.FastScrollerBuilder
+import me.zhanghai.android.fastscroll.PopupTextProvider
 import io.nekohasekai.sagernet.BuildConfig
 import io.nekohasekai.sagernet.R
 import io.nekohasekai.sagernet.SagerNet
@@ -101,7 +102,7 @@ class AppManagerActivity : ThemedActivity() {
     }
 
     private inner class AppsAdapter : RecyclerView.Adapter<AppViewHolder>(),
-        FastScrollRecyclerView.SectionedAdapter {
+        PopupTextProvider {
         var filteredApps = apps
 
         suspend fun reload() {
@@ -149,7 +150,7 @@ class AppManagerActivity : ThemedActivity() {
             notifyDataSetChanged()
         }
 
-        override fun getSectionName(position: Int): String {
+        override fun getPopupText(view: View, position: Int): CharSequence {
             return filteredApps[position].name.firstOrNull()?.toString() ?: ""
         }
 
@@ -253,6 +254,7 @@ class AppManagerActivity : ThemedActivity() {
         binding.list.layoutManager = LinearLayoutManager(this, RecyclerView.VERTICAL, false)
         binding.list.itemAnimator = DefaultItemAnimator()
         binding.list.adapter = appsAdapter
+        FastScrollerBuilder(binding.list).useMd2Style().build()
 
         ViewCompat.setOnApplyWindowInsetsListener(binding.root, ListListener)
 

app/src/main/java/io/nekohasekai/sagernet/ui/ConfigurationFragment.kt

@@ -115,6 +115,7 @@ import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import me.zhanghai.android.fastscroll.FastScrollerBuilder
 import moe.matsuri.nb4a.Protocols
 import moe.matsuri.nb4a.Protocols.getProtocolColor
 import moe.matsuri.nb4a.proxy.anytls.AnyTLSSettingsActivity
@@ -1400,6 +1401,7 @@ class ConfigurationFragment @JvmOverloads constructor(
             GroupManager.addListener(adapter!!)
             configurationListView.adapter = adapter
             configurationListView.setItemViewCacheSize(20)
+            FastScrollerBuilder(configurationListView).useMd2Style().build()
 
             // Hide the docked FAB while scrolling down (so it never overlaps the
             // bottom card) and bring it back on upward scroll or when the list

app/src/main/java/io/nekohasekai/sagernet/ui/GroupFragment.kt

@@ -24,6 +24,7 @@ import io.nekohasekai.sagernet.databinding.LayoutGroupItemBinding
 import io.nekohasekai.sagernet.fmt.toUniversalLink
 import io.nekohasekai.sagernet.group.GroupUpdater
 import io.nekohasekai.sagernet.ktx.*
+import me.zhanghai.android.fastscroll.FastScrollerBuilder
 import io.nekohasekai.sagernet.widget.ListListener
 import io.nekohasekai.sagernet.widget.QRCodeDialog
 import io.nekohasekai.sagernet.widget.UndoSnackbarManager
@@ -57,6 +58,7 @@ class GroupFragment : ToolbarFragment(R.layout.layout_group),
         groupAdapter = GroupAdapter()
         GroupManager.addListener(groupAdapter)
         groupListView.adapter = groupAdapter
+        FastScrollerBuilder(groupListView).useMd2Style().build()
 
         undoManager = UndoSnackbarManager(activity, groupAdapter)
 

app/src/main/java/io/nekohasekai/sagernet/ui/RouteFragment.kt

@@ -21,6 +21,7 @@ import io.nekohasekai.sagernet.databinding.LayoutEmptyRouteBinding
 import io.nekohasekai.sagernet.databinding.LayoutRouteBinding
 import io.nekohasekai.sagernet.databinding.LayoutRouteItemBinding
 import io.nekohasekai.sagernet.ktx.*
+import me.zhanghai.android.fastscroll.FastScrollerBuilder
 import io.nekohasekai.sagernet.widget.ListListener
 import io.nekohasekai.sagernet.widget.UndoSnackbarManager
 
@@ -46,6 +47,7 @@ class RouteFragment : ToolbarFragment(R.layout.layout_route), Toolbar.OnMenuItem
         ruleAdapter = RuleAdapter()
         ProfileManager.addListener(ruleAdapter)
         ruleListView.adapter = ruleAdapter
+        FastScrollerBuilder(ruleListView).useMd2Style().build()
         undoManager = UndoSnackbarManager(activity, ruleAdapter)
 
         ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP or ItemTouchHelper.DOWN, ItemTouchHelper.START) {

app/src/main/java/io/nekohasekai/sagernet/ui/profile/ChainSettingsActivity.kt

@@ -27,6 +27,7 @@ import io.nekohasekai.sagernet.databinding.LayoutProfileBinding
 import io.nekohasekai.sagernet.fmt.internal.ChainBean
 import io.nekohasekai.sagernet.ktx.*
 import io.nekohasekai.sagernet.ui.ProfileSelectActivity
+import me.zhanghai.android.fastscroll.FastScrollerBuilder
 import moe.matsuri.nb4a.Protocols.getProtocolColor
 
 class ChainSettingsActivity : ProfileSettingsActivity<ChainBean>(R.layout.layout_chain_settings) {
@@ -69,6 +70,7 @@ class ChainSettingsActivity : ProfileSettingsActivity<ChainBean>(R.layout.layout
         configurationList.layoutManager = layoutManager
         configurationAdapter = ProxiesAdapter()
         configurationList.adapter = configurationAdapter
+        FastScrollerBuilder(configurationList).useMd2Style().build()
 
         ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(
             ItemTouchHelper.UP or ItemTouchHelper.DOWN, ItemTouchHelper.START

app/src/main/res/layout/layout_app_list.xml

@@ -101,17 +101,13 @@
 
     </LinearLayout>
 
-    <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
         android:scrollbarSize="0dp"
         android:visibility="gone"
-        app:fastScrollAutoHide="true"
-        app:fastScrollPopupTextColor="?colorPrimary"
-        app:fastScrollThumbColor="?colorPrimary"
-        app:fastScrollThumbInactiveColor="?colorPrimary"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:listitem="@layout/layout_apps_item" />
 

app/src/main/res/layout/layout_apps.xml

@@ -138,17 +138,13 @@
 
     </LinearLayout>
 
-    <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
         android:scrollbarSize="0dp"
         android:visibility="gone"
-        app:fastScrollAutoHide="true"
-        app:fastScrollPopupTextColor="?colorPrimary"
-        app:fastScrollThumbColor="?colorPrimary"
-        app:fastScrollThumbInactiveColor="?colorPrimary"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:listitem="@layout/layout_apps_item" />
 

app/src/main/res/layout/layout_chain_settings.xml

@@ -1,5 +1,4 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -21,20 +20,13 @@
         android:background="@android:color/darker_gray"
         android:orientation="horizontal" />
 
-    <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/configuration_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
         android:scrollbarSize="0dp"
         android:padding="4dp"
-        android:overScrollMode="never"
-        app:fastScrollAutoHide="true"
-        app:fastScrollPopupTextColor="?colorPrimary"
-        app:fastScrollThumbColor="?colorPrimary"
-        app:fastScrollThumbInactiveColor="?colorPrimary"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-    </com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView>
+        android:overScrollMode="never" />
 
 </LinearLayout>

app/src/main/res/layout/layout_group.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -14,17 +13,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/group_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:padding="4dp"
-            android:scrollbarSize="0dp"
-            app:fastScrollAutoHide="true"
-            app:fastScrollThumbColor="?colorPrimary"
-            app:fastScrollThumbInactiveColor="?colorPrimary">
-
-        </com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView>
+            android:scrollbarSize="0dp" />
 
     </LinearLayout>
 

app/src/main/res/layout/layout_profile_list.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/configuration_list"
     android:layout_width="match_parent"
@@ -12,7 +11,4 @@
     android:paddingRight="4dp"
     android:paddingBottom="168dp"
     android:scrollbarSize="0dp"
-    app:fastScrollAutoHide="true"
-    app:fastScrollThumbColor="?colorPrimary"
-    app:fastScrollThumbInactiveColor="?colorPrimary"
-    tools:listitem="@layout/layout_profile" />
+    tools:listitem="@layout/layout_profile" />

app/src/main/res/layout/layout_route.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -14,7 +13,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/route_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -23,12 +22,7 @@
             android:paddingTop="4dp"
             android:paddingRight="4dp"
             android:paddingBottom="168dp"
-            android:scrollbarSize="0dp"
-            app:fastScrollAutoHide="true"
-            app:fastScrollThumbColor="?colorPrimary"
-            app:fastScrollThumbInactiveColor="?colorPrimary">
-
-        </com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView>
+            android:scrollbarSize="0dp" />
 
     </LinearLayout>
 

build.gradle.kts

@@ -8,5 +8,5 @@ tasks.register<Delete>("clean") {
 }
 
 plugins {
-    id("com.google.devtools.ksp") version "2.1.21-2.0.2" apply false
+    id("com.google.devtools.ksp") version "2.3.9" apply false
 }

buildSrc/build.gradle.kts

@@ -8,5 +8,5 @@ apply(from = "../repositories.gradle.kts")
 dependencies {
     // Gradle Plugins
     implementation("com.android.tools.build:gradle:8.13.2")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10")
 }