Commit 4c7bdcf
authored
Modernize toolchain: Kotlin 2.3.10 + KSP2, sora-editor 0.24.6, drop abandoned deps (#59)
* Modernize toolchain: Kotlin 2.3.10 + KSP2, sora-editor 0.24.6, drop abandoned deps
Toolchain (Kotlin 2.1.21 -> 2.3.10, KSP 2.1.21-2.0.2 -> 2.3.9):
- KSP 2.3.x is KSP2-only; migrated Helpers.kt off the removed
kotlinOptions/KotlinJvmOptions API to the compilerOptions DSL
(jvmTarget = JvmTarget.JVM_17), which is a hard error under Kotlin 2.3.
- Moved the `ksp { }` room schema config to a top-level block (it is a
project-level extension, not part of the Android DSL).
- AGP stays 8.13.2, Gradle stays 8.14.5 (verified compatible in practice).
sora-editor: editor-bom 0.23.7 -> 0.24.6 (now unblocked by Kotlin 2.3).
Remove Roomigrant (com.github.MatrixDev.Roomigrant, abandoned JitPack):
- It was already dead code: the only consumer of its generated migrations
was a commented-out addMigrations() call. Real migration strategy is
Room-native autoMigrations + fallbackToDestructiveMigration(), unchanged.
- Dropped both deps, the @GenerateRoomMigrations annotations/imports, and the
now-unused jitpack repository. Room codegen verified under KSP2 (DAO/db/
auto-migration impls still generated; schemas intact).
Replace recyclerview-fastscroll (com.simplecityapps, abandoned) with
me.zhanghai.android.fastscroll:library:1.3.0 (AndroidX-native):
- 6 layouts: FastScrollRecyclerView -> RecyclerView.
- Attach FastScrollerBuilder(...).useMd2Style().build() per list.
- App list/manager: SectionedAdapter.getSectionName -> PopupTextProvider.getPopupText.
- Dropped unused app: namespaces; removed a pre-existing no-op
app:layout_behavior on the chain settings list (LinearLayout parent).
Verified locally on JDK 17: oss debug compile + full assembleOssRelease
(R8/minify, lintVital, desugaring) pass.
* Address Greptile review: move jvmTarget config out of android.apply; XML trailing newline
- Helpers.kt: move tasks.withType<KotlinCompile> (a project-level call) out of the
android.apply {} block to make scope explicit, matching the top-level ksp{} block.
- layout_chain_settings.xml: restore trailing newline.1 parent f7f4aad commit 4c7bdcf
19 files changed
Lines changed: 54 additions & 73 deletions
File tree
- app
- src/main
- java/io/nekohasekai/sagernet
- database
- preference
- ui
- profile
- res/layout
- buildSrc
- src/main/kotlin
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | 16 | | |
21 | 17 | | |
22 | 18 | | |
| |||
38 | 34 | | |
39 | 35 | | |
40 | 36 | | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
41 | 45 | | |
42 | 46 | | |
43 | 47 | | |
| |||
76 | 80 | | |
77 | 81 | | |
78 | 82 | | |
79 | | - | |
| 83 | + | |
80 | 84 | | |
81 | 85 | | |
82 | 86 | | |
| |||
87 | 91 | | |
88 | 92 | | |
89 | 93 | | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
| 94 | + | |
94 | 95 | | |
95 | 96 | | |
96 | 97 | | |
97 | 98 | | |
98 | | - | |
99 | | - | |
100 | 99 | | |
101 | 100 | | |
102 | 101 | | |
Lines changed: 0 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | 8 | | |
10 | 9 | | |
11 | 10 | | |
| |||
26 | 25 | | |
27 | 26 | | |
28 | 27 | | |
29 | | - | |
30 | 28 | | |
31 | 29 | | |
32 | 30 | | |
| |||
35 | 33 | | |
36 | 34 | | |
37 | 35 | | |
38 | | - | |
39 | 36 | | |
40 | 37 | | |
41 | 38 | | |
| |||
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | 6 | | |
8 | 7 | | |
9 | 8 | | |
10 | 9 | | |
11 | 10 | | |
12 | 11 | | |
13 | | - | |
14 | 12 | | |
15 | 13 | | |
16 | 14 | | |
| |||
Lines changed: 5 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
97 | 98 | | |
98 | 99 | | |
99 | 100 | | |
100 | | - | |
| 101 | + | |
101 | 102 | | |
102 | 103 | | |
103 | 104 | | |
| |||
146 | 147 | | |
147 | 148 | | |
148 | 149 | | |
149 | | - | |
| 150 | + | |
150 | 151 | | |
151 | 152 | | |
152 | 153 | | |
| |||
214 | 215 | | |
215 | 216 | | |
216 | 217 | | |
| 218 | + | |
217 | 219 | | |
218 | 220 | | |
219 | 221 | | |
| |||
Lines changed: 5 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
101 | 102 | | |
102 | 103 | | |
103 | 104 | | |
104 | | - | |
| 105 | + | |
105 | 106 | | |
106 | 107 | | |
107 | 108 | | |
| |||
149 | 150 | | |
150 | 151 | | |
151 | 152 | | |
152 | | - | |
| 153 | + | |
153 | 154 | | |
154 | 155 | | |
155 | 156 | | |
| |||
253 | 254 | | |
254 | 255 | | |
255 | 256 | | |
| 257 | + | |
256 | 258 | | |
257 | 259 | | |
258 | 260 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
| 118 | + | |
118 | 119 | | |
119 | 120 | | |
120 | 121 | | |
| |||
1400 | 1401 | | |
1401 | 1402 | | |
1402 | 1403 | | |
| 1404 | + | |
1403 | 1405 | | |
1404 | 1406 | | |
1405 | 1407 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
57 | 58 | | |
58 | 59 | | |
59 | 60 | | |
| 61 | + | |
60 | 62 | | |
61 | 63 | | |
62 | 64 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| |||
46 | 47 | | |
47 | 48 | | |
48 | 49 | | |
| 50 | + | |
49 | 51 | | |
50 | 52 | | |
51 | 53 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
| |||
69 | 70 | | |
70 | 71 | | |
71 | 72 | | |
| 73 | + | |
72 | 74 | | |
73 | 75 | | |
74 | 76 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
104 | | - | |
| 104 | + | |
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
110 | 110 | | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | 111 | | |
116 | 112 | | |
117 | 113 | | |
| |||
0 commit comments