Migrate moshi to KSP

d4rken-org · Sep 14, 2024 · d16c6fc · d16c6fc
1 parent af9dbf2
commit d16c6fc
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 7 deletions.
diff --git a/app-common-io/build.gradle.kts b/app-common-io/build.gradle.kts
@@ -2,8 +2,9 @@ plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
     id("kotlin-android")
-    id("kotlin-kapt")
     id("kotlin-parcelize")
+    id("com.google.devtools.ksp")
+    id("kotlin-kapt")
     id("projectConfig")
 }
 

diff --git a/app-common-root/build.gradle.kts b/app-common-root/build.gradle.kts
@@ -2,8 +2,9 @@ plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
     id("kotlin-android")
-    id("kotlin-kapt")
     id("kotlin-parcelize")
+    id("com.google.devtools.ksp")
+    id("kotlin-kapt")
     id("projectConfig")
 }
 

diff --git a/app-common-shizuku/build.gradle.kts b/app-common-shizuku/build.gradle.kts
@@ -2,8 +2,9 @@ plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
     id("kotlin-android")
-    id("kotlin-kapt")
     id("kotlin-parcelize")
+    id("com.google.devtools.ksp")
+    id("kotlin-kapt")
     id("projectConfig")
 }
 

diff --git a/app-common-test/build.gradle.kts b/app-common-test/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
     id("kotlin-android")
+    id("com.google.devtools.ksp")
     id("kotlin-kapt")
     id("projectConfig")
 }

diff --git a/app-common/build.gradle.kts b/app-common/build.gradle.kts
@@ -2,8 +2,9 @@ plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
     id("kotlin-android")
-    id("kotlin-kapt")
     id("kotlin-parcelize")
+    id("com.google.devtools.ksp")
+    id("kotlin-kapt")
     id("projectConfig")
 }
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-parcelize")
     id("projectConfig")
+    id("com.google.devtools.ksp")
     id("kotlin-kapt")
 }
 apply(plugin = "dagger.hilt.android.plugin")
@@ -206,6 +207,8 @@ dependencies {
     androidTestImplementation("androidx.navigation:navigation-testing:${Versions.AndroidX.Navigation.core}")
 
 
+
+
     testImplementation("org.robolectric:robolectric:4.9.1")
     testImplementation("androidx.test.ext:junit:1.1.4")
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     id("projectConfig")
+    id("com.google.devtools.ksp") version "1.9.25-1.0.20" apply false
 }
 
 buildscript {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -18,6 +18,6 @@ repositories {
 }
 dependencies {
     implementation("com.android.tools.build:gradle:8.4.2")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
     implementation("com.squareup:javapoet:1.13.0")
 }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -11,6 +11,9 @@ private fun DependencyHandler.testImplementation(dependencyNotation: Any): Depen
 private fun DependencyHandler.kapt(dependencyNotation: Any): Dependency? =
     add("kapt", dependencyNotation)
 
+private fun DependencyHandler.ksp(dependencyNotation: Any): Dependency? =
+    add("ksp", dependencyNotation)
+
 private fun DependencyHandler.kaptTest(dependencyNotation: Any): Dependency? =
     add("kaptTest", dependencyNotation)
 
@@ -75,7 +78,7 @@ fun DependencyHandlerScope.addSerialization() {
     val version = "1.15.1"
     implementation("com.squareup.moshi:moshi:$version")
     implementation("com.squareup.moshi:moshi-adapters:$version")
-    kapt("com.squareup.moshi:moshi-kotlin-codegen:$version")
+    add("ksp", "com.squareup.moshi:moshi-kotlin-codegen:$version")
 }
 
 fun DependencyHandlerScope.addIO() {

diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
@@ -1,6 +1,6 @@
 object Versions {
     object Kotlin {
-        const val core = "1.9.24"
+        const val core = "1.9.25"
         const val coroutines = "1.8.0"
     }