chore: Migrate kapt to KSP

hushenghao · Dec 2, 2023 · 30ce74f · 30ce74f
1 parent f7a4f4b
commit 30ce74f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
-### v2.2.2 (2023-11-26)
-- Fix F-Droid Reproducible Builds
+### v2.2.2
 - Fix Guide page layout [#116](https://github.com/hushenghao/AndroidEasterEggs/issues/116)
+- Migrate kapt to KSP
 
 ### v2.2.1 (2023-11-25)
 - Fix F-Droid Reproducible Builds

diff --git a/build-logic/src/main/kotlin/EasterEggApp.kt b/build-logic/src/main/kotlin/EasterEggApp.kt
@@ -12,13 +12,13 @@ class EasterEggApp : Plugin<Project> {
                 apply("com.android.application")
                 apply("com.google.dagger.hilt.android")
                 apply("org.jetbrains.kotlin.android")
-                apply("kotlin-kapt")
+                apply("com.google.devtools.ksp")
             }
 
             dependencies {
                 "implementation"(project(path = ":basic"))
                 "implementation"(catalog.findLibrary("hilt.android").get())
-                "kapt"(catalog.findLibrary("hilt.compiler").get())
+                "ksp"(catalog.findLibrary("hilt.compiler").get())
             }
 
             configureAndroid<BaseAppModuleExtension> {

diff --git a/build-logic/src/main/kotlin/EasterEggLibrary.kt b/build-logic/src/main/kotlin/EasterEggLibrary.kt
@@ -10,13 +10,13 @@ class EasterEggLibrary : EasterEggBasicLibrary() {
         with(target) {
             pluginManager.apply {
                 apply("com.google.dagger.hilt.android")
-                apply("kotlin-kapt")
+                apply("com.google.devtools.ksp")
             }
 
             dependencies {
                 "implementation"(project(path = ":basic"))
                 "implementation"(catalog.findLibrary("hilt.android").get())
-                "kapt"(catalog.findLibrary("hilt.compiler").get())
+                "ksp"(catalog.findLibrary("hilt.compiler").get())
             }
 
             configureAndroid<LibraryExtension> {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.hilt.android) apply false
+    alias(libs.plugins.ksp) apply false
 }
 
 task<Delete>("clean") {

diff --git a/fastlane/metadata/android/en-US/changelogs/35.txt b/fastlane/metadata/android/en-US/changelogs/35.txt
@@ -1,2 +1,2 @@
-- Fix F-Droid Reproducible Builds
-- Fix Guide page layout
+- Fix Guide page layout
+- Migrate kapt to KSP
diff --git a/fastlane/metadata/android/zh-CN/changelogs/35.txt b/fastlane/metadata/android/zh-CN/changelogs/35.txt
@@ -1,2 +1,2 @@
-- 修复F-Droid可重复构建
-- 修复引导页布局
+- 修复引导页布局
+- 迁移kapt到KSP
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,6 @@
 [versions]
 kotlin = "1.9.21"
+ksp = "1.9.21-1.0.15"
 # https://androidx.dev/storage/compose-compiler/repository
 # https://maven.google.com/web/index.html?q=compose#androidx.compose.compiler:compiler
 compose-kotlin-compiler = "1.5.5"
@@ -13,6 +14,7 @@ android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 
 [libraries]
 kotlinx-coroutines-android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"