Skip to content

Commit fb9084a

Browse files
committed
kapt to ksp
1 parent 904610c commit fb9084a

11 files changed

Lines changed: 47 additions & 91 deletions

File tree

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
id 'com.android.application'
33
id 'org.jetbrains.kotlin.android'
4+
id 'com.google.devtools.ksp'
45
}
5-
apply plugin: 'kotlin-kapt'
66

77
//apply plugin: "com.dorongold.task-tree"
88

@@ -156,7 +156,7 @@ dependencies {
156156
implementation 'com.github.bingoogolapple:BGABaseAdapter-Android:2.0.1'
157157
implementation 'com.jakewharton:butterknife:10.2.3'
158158
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
159-
kapt 'com.jakewharton:butterknife-compiler:10.2.3'
159+
ksp 'com.jakewharton:butterknife-compiler:10.2.3'
160160
implementation 'com.facebook.stetho:stetho:1.6.0'
161161
implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0'
162162
implementation 'com.airbnb.android:lottie:6.6.7'
@@ -165,7 +165,7 @@ dependencies {
165165
implementation 'net.sourceforge.streamsupport:streamsupport:1.7.4'
166166

167167
implementation "com.alibaba:arouter-api:$ext.arouter_api"
168-
kapt "com.alibaba:arouter-compiler:$ext.arouter_compiler"
168+
ksp "com.alibaba:arouter-compiler:$ext.arouter_compiler"
169169

170170
implementation "androidx.palette:palette-ktx:1.0.0"
171171
implementation 'com.tencent:mmkv:2.2.2'

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
plugins {
44
id 'com.android.application' version '8.13.0' apply false
55
id 'com.android.library' version '8.13.0' apply false
6-
id 'org.jetbrains.kotlin.android' version '2.2.10' apply false
7-
id 'com.google.devtools.ksp' version '2.2.10-2.0.2' apply false
8-
id 'org.jetbrains.kotlin.plugin.compose' version '2.2.10' apply false
6+
id 'org.jetbrains.kotlin.android' version '2.2.20' apply false
7+
id 'com.google.devtools.ksp' version '2.2.20-2.0.3' apply false
8+
id 'org.jetbrains.kotlin.plugin.compose' version '2.2.20' apply false
99
}
1010
apply from: file('config.gradle')
1111
//buildscript {

gradle/libs.versions.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
[versions]
22
agp = "8.7.0"
3-
dagger = "2.57"
4-
daggerCompiler = "2.57"
3+
dagger = "2.57.1"
4+
daggerCompiler = "2.57.1"
55
kotlin = "2.0.0"
6-
coreKtx = "1.16.0"
6+
coreKtx = "1.17.0"
77
junit = "4.14-SNAPSHOT"
8-
junitVersion = "1.2.1"
9-
espressoCore = "3.6.1"
10-
lifecycleRuntimeKtx = "2.9.2"
11-
activityCompose = "1.10.1"
12-
composeBom = "2025.07.00"
8+
junitVersion = "1.3.0"
9+
espressoCore = "3.7.0"
10+
lifecycleRuntimeKtx = "2.9.3"
11+
activityCompose = "1.11.0"
12+
composeBom = "2025.09.00"
1313
coilCompose = "2.7.0"
14-
composeRuntimeLiveData= "1.8.3"
14+
composeRuntimeLiveData= "1.9.1"
1515
accompanistPager = "0.36.0"
16-
lifecycleViewmodelCompose = "2.9.2"
17-
kotlinVersion = "2.2.0"
18-
roomRxjava2 = "2.7.2"
19-
materialIconsExtended = "1.6.0"
16+
lifecycleViewmodelCompose = "2.9.3"
17+
kotlinVersion = "2.2.20"
18+
roomRxjava2 = "2.8.0"
19+
materialIconsExtended = "1.7.8"
2020

2121

2222
[libraries]

imitate/build.gradle

Lines changed: 9 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
2-
id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.10'
2+
id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.20'
3+
id 'com.google.devtools.ksp'
34
}
45

56
if (imitate_isApp.toBoolean()) {
@@ -10,25 +11,6 @@ if (imitate_isApp.toBoolean()) {
1011

1112
apply plugin: 'kotlin-android'
1213
apply plugin: 'org.jetbrains.kotlin.plugin.compose'
13-
apply plugin: 'kotlin-kapt'
14-
15-
class RoomSchemaArgProvider implements CommandLineArgumentProvider {
16-
17-
@InputDirectory
18-
@PathSensitive(PathSensitivity.RELATIVE)
19-
File schemaDir
20-
21-
RoomSchemaArgProvider(File schemaDir) {
22-
this.schemaDir = schemaDir
23-
}
24-
25-
@Override
26-
Iterable<String> asArguments() {
27-
// Note: If you're using KSP, change the line below to return
28-
// ["room.schemaLocation=${schemaDir.path}".toString()].
29-
return ["-Aroom.schemaLocation=${schemaDir.path}".toString()]
30-
}
31-
}
3214

3315
static def releaseTime() {
3416
return new Date().format("yyyyMMddHHmm", TimeZone.getTimeZone("GMT+8"))
@@ -47,17 +29,6 @@ android {
4729

4830
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4931

50-
kapt {
51-
arguments {
52-
arg("moduleName", project.getName())
53-
}
54-
}
55-
javaCompileOptions {
56-
annotationProcessorOptions {
57-
arguments = [AROUTER_MODULE_NAME: project.getName()]
58-
compilerArgumentProviders(new RoomSchemaArgProvider(new File(projectDir, "schemas")))
59-
}
60-
}
6132
//只保留中文资源和 xxhdpi 分辨率图片
6233
resourceConfigurations += ['zh-rCN', 'xxhdpi']
6334

@@ -130,10 +101,9 @@ android {
130101
namespace 'com.engineer.imitate'
131102
}
132103

133-
kapt {
134-
arguments {
135-
arg("moduleName", project.getName())
136-
}
104+
ksp {
105+
arg("AROUTER_MODULE_NAME", project.getName())
106+
arg("room.schemaLocation", new File(projectDir, "schemas").path)
137107
}
138108

139109
dependencies {
@@ -153,7 +123,7 @@ dependencies {
153123

154124

155125
implementation "com.alibaba:arouter-api:$ext.arouter_api"
156-
kapt "com.alibaba:arouter-compiler:$ext.arouter_compiler"
126+
ksp "com.alibaba:arouter-compiler:$ext.arouter_compiler"
157127
implementation('com.facebook.fresco:fresco:3.6.0') {
158128
exclude group: 'com.facebook.soloader', module: 'soloader'
159129
exclude group: 'com.facebook.fresco', module: 'soloader'
@@ -215,8 +185,7 @@ dependencies {
215185
//room
216186
implementation "androidx.room:room-runtime:$ext.roomVersion_runtime"
217187
implementation libs.androidx.room.rxjava2
218-
// kapt 'org.xerial:sqlite-jdbc:3.36.0.3' // for mac m1
219-
kapt "androidx.room:room-compiler:$ext.roomVersion"
188+
ksp "androidx.room:room-compiler:$ext.roomVersion"
220189

221190
implementation 'com.github.wanglu1209:PhotoViewer:0.50'
222191

@@ -225,16 +194,14 @@ dependencies {
225194
implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
226195

227196
// from 2021
228-
implementation 'com.beust:klaxon:5.6'
229-
// implementation 'com.alibaba:fastjson:2.0.57'
230197
implementation 'com.alibaba:fastjson:1.1.71.android'
231198
implementation 'com.google.code.gson:gson:2.13.1'
232199
implementation libs.dagger
233-
kapt libs.dagger.compiler
200+
ksp libs.dagger.compiler
234201

235202
implementation("com.squareup.moshi:moshi:1.15.2") // 核心库
236203
implementation("com.squareup.moshi:moshi-kotlin:1.15.2") // Kotlin 扩展(支持数据类)
237-
kapt("com.squareup.moshi:moshi-kotlin-codegen:1.15.2") // 代码生成(替代反射)
204+
ksp("com.squareup.moshi:moshi-kotlin-codegen:1.15.2") // 代码生成(替代反射)
238205

239206
// coroutines
240207
// 👇 依赖协程核心库

imitate/src/main/java/com/engineer/imitate/ImitateApplication.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import androidx.lifecycle.OnLifecycleEvent
1414
import androidx.lifecycle.ProcessLifecycleOwner
1515
import com.alibaba.android.arouter.launcher.ARouter
1616
import com.engineer.imitate.interfaces.SimpleActivityCallback
17-
import com.engineer.imitate.ui.fragments.di.DaggerApplicationComponent
17+
//import com.engineer.imitate.ui.fragments.di.DaggerApplicationComponent
1818
import com.engineer.imitate.util.SpUtil
1919
import com.engineer.imitate.util.SystemUtil
2020
import com.engineer.imitate.util.TextUtil
@@ -30,7 +30,7 @@ import com.facebook.stetho.Stetho
3030
@SuppressLint("LogNotTimber")
3131
class ImitateApplication : Application() {
3232

33-
val applicationComponent = DaggerApplicationComponent.create()
33+
// val applicationComponent = DaggerApplicationComponent.create()
3434

3535
companion object {
3636
lateinit var application: Context

imitate/src/main/java/com/engineer/imitate/ui/fragments/CoroutinesPlayGround.kt

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
1616
import androidx.viewpager2.widget.ViewPager2
1717
import com.alibaba.android.arouter.facade.annotation.Route
1818
import com.alibaba.fastjson.JSONObject
19-
import com.beust.klaxon.Klaxon
2019
import com.engineer.imitate.R
2120
import com.engineer.imitate.model.School
2221
import com.engineer.imitate.model.Schools
@@ -62,7 +61,6 @@ class CoroutinesFragment : Fragment() {
6261
super.onViewCreated(view, savedInstanceState)
6362
// useRx {
6463
//// parseWithFastJson(it)
65-
//// parseWithKlaxon(it)
6664
// parseWithGson(it)
6765
// }
6866

@@ -72,7 +70,7 @@ class CoroutinesFragment : Fragment() {
7270
progress = view.findViewById(R.id.progress)
7371
school_view_pager2 = view.findViewById(R.id.school_view_pager2)
7472
school_tab_layout = view.findViewById(R.id.school_tab_layout)
75-
useCoroutine2 { parseWithKlaxon(it) }
73+
7674
useCoroutine2 { parseWithFastJson(it) }
7775
useCoroutine2 { parseWithFastJson1(it) }
7876
useCoroutine2 { parseWithGson(it) }
@@ -228,13 +226,6 @@ class ListFragment : Fragment() {
228226

229227
data class Item(val title: String, val fragment: Fragment, val size: Int)
230228

231-
private fun parseWithKlaxon(json: String): List<Schools>? {
232-
val s = System.currentTimeMillis()
233-
val list = Klaxon().parseArray<Schools>(json)
234-
Log.e(TAG, "parseWithKlaxon cost ${System.currentTimeMillis() - s}")
235-
return list
236-
}
237-
238229
private fun parseWithFastJson(json: String): List<Schools>? {
239230
val s = System.currentTimeMillis()
240231
val list = JSONObject.parseArray(json, Schools::class.java)

imitate/src/main/java/com/engineer/imitate/ui/fragments/di/DIFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class DIFragment : Fragment() {
4747
override fun onAttach(context: Context) {
4848
super.onAttach(context)
4949
val app = getContext()?.applicationContext as ImitateApplication
50-
app.applicationComponent?.inject(this)
50+
// app.applicationComponent?.inject(this)
5151

5252
}
5353

imitate/src/main/java/com/engineer/imitate/ui/fragments/di/DaggerPlayground.kt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ fun main() {
1313
private fun testDagger() {
1414
val TAG = "Dagger"
1515

16-
val applicationGraph = DaggerApplicationGraph.create()
17-
18-
val userRepo1 = applicationGraph.repository()
19-
val userRepo2 = applicationGraph.repository()
20-
Log.e(TAG, "testDagger: user1 == user2 ${userRepo1 == userRepo2}")
21-
22-
23-
val myGraph = DaggerMyGraph.create()
24-
val obj1 = myGraph.getObj()
25-
val obj2 = myGraph.getObj()
26-
Log.e(TAG, "testDagger: obj1 == obj2 ${obj1 == obj2}")
27-
Log.e(TAG, "testDagger: obj.getInfo() = ${obj1.getInfo()}")
16+
// val applicationGraph = DaggerApplicationGraph.create()
17+
18+
// val userRepo1 = applicationGraph.repository()
19+
// val userRepo2 = applicationGraph.repository()
20+
// Log.e(TAG, "testDagger: user1 == user2 ${userRepo1 == userRepo2}")
21+
//
22+
//
23+
// val myGraph = DaggerMyGraph.create()
24+
// val obj1 = myGraph.getObj()
25+
// val obj2 = myGraph.getObj()
26+
// Log.e(TAG, "testDagger: obj1 == obj2 ${obj1 == obj2}")
27+
// Log.e(TAG, "testDagger: obj.getInfo() = ${obj1.getInfo()}")
2828
}
2929

3030
object Log {

subs/compose/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
def ext = rootProject.ext
77
android {
88
namespace 'com.engineer.compose'
9-
compileSdk 35
9+
compileSdk ext.compileSdk
1010

1111
defaultConfig {
1212
minSdk ext.minSdk

subs/dataview/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-kapt'
3+
apply plugin: 'com.google.devtools.ksp'
44

55

66
def ext = rootProject.ext
@@ -40,7 +40,7 @@ dependencies {
4040

4141
implementation "androidx.room:room-runtime:$ext.roomVersion"
4242
implementation "androidx.room:room-rxjava2:$ext.roomVersion"
43-
kapt "androidx.room:room-compiler:$ext.roomVersion"
43+
ksp "androidx.room:room-compiler:$ext.roomVersion"
4444
androidTestImplementation "androidx.room:room-testing:$ext.roomVersion"
4545

4646
implementation "androidx.lifecycle:lifecycle-extensions:$ext.archLifecycleVersion"

0 commit comments

Comments
 (0)