Migrate from KAPT to KSP

tsshadow · Jul 31, 2023 · ddf8ce7 · ddf8ce7
1 parent f99fb1c
commit ddf8ce7
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     apply from: 'gradle/versions.gradle'
@@ -10,6 +12,7 @@ buildscript {
     repositories {
         google()
         mavenCentral()
+        gradlePluginPortal()
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
@@ -26,21 +29,29 @@ allprojects {
     buildscript {
         repositories {
             mavenCentral()
+            gradlePluginPortal()
             google()
         }
     }
 
     repositories {
         mavenCentral()
+        gradlePluginPortal()
         google()
     }
 
     // Set Kotlin JVM target to the same for all subprojects
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    tasks.withType(KotlinCompile).configureEach {
         kotlinOptions {
             jvmTarget = "17"
         }
     }
+
+    tasks.withType(JavaCompile).tap {
+        configureEach {
+            options.compilerArgs.add("-Xlint:deprecation")
+        }
+    }
 }
 
 wrapper {

diff --git a/core/domain/build.gradle b/core/domain/build.gradle
@@ -1,11 +1,14 @@
+plugins {
+    alias libs.plugins.ksp
+}
+
 apply from: bootstrap.androidModule
-apply plugin: 'kotlin-kapt'
 
 dependencies {
     implementation libs.core
     implementation libs.roomRuntime
     implementation libs.roomKtx
-    kapt libs.room
+    ksp libs.room
 }
 
 android {

diff --git a/core/subsonic-api/build.gradle b/core/subsonic-api/build.gradle
@@ -1,3 +1,7 @@
+plugins {
+    alias libs.plugins.ksp
+}
+
 apply from: bootstrap.kotlinModule
 
 dependencies {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,6 +17,7 @@ constraintLayout       = "2.1.4"
 multidex               = "2.0.1"
 room                   = "2.5.2"
 kotlin                 = "1.8.22"
+ksp                    = "1.8.22-1.0.11"
 kotlinxCoroutines      = "1.7.3"
 viewModelKtx           = "2.6.1"
 swipeRefresh           = "1.1.0"
@@ -100,3 +101,6 @@ kluentAndroid           = { module = "org.amshove.kluent:kluent-android", versio
 mockWebServer           = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
 apacheCodecs            = { module = "commons-codec:commons-codec", version.ref = "apacheCodecs" }
 robolectric             = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+
+[plugins]
+ksp                     = { id = "com.google.devtools.ksp", version.ref = "ksp" }
diff --git a/gradle_scripts/android-module-bootstrap.gradle b/gradle_scripts/android-module-bootstrap.gradle
@@ -4,7 +4,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'
 apply from: "${project.rootDir}/gradle_scripts/code_quality.gradle"
-apply plugin: 'org.jetbrains.kotlin.kapt'
+apply plugin: 'com.google.devtools.ksp'
 
 android {
     compileSdkVersion versions.compileSdk

diff --git a/gradle_scripts/kotlin-module-bootstrap.gradle b/gradle_scripts/kotlin-module-bootstrap.gradle
@@ -2,7 +2,7 @@
  * This module provides a base for for pure kotlin modules
  */
 apply plugin: 'kotlin'
-apply plugin: 'org.jetbrains.kotlin.kapt'
+apply plugin: 'com.google.devtools.ksp'
 apply from: "${project.rootDir}/gradle_scripts/code_quality.gradle"
 
 sourceSets {
@@ -12,7 +12,6 @@ sourceSets {
     test.resources.srcDirs += "${projectDir}/src/integrationTest/resources"
 }
 
-
 dependencies {
     api libs.kotlinStdlib
 

diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
@@ -1,6 +1,9 @@
+plugins {
+    alias libs.plugins.ksp
+}
+
 apply plugin: 'com.android.application'
 apply plugin: 'org.jetbrains.kotlin.android'
-apply plugin: 'org.jetbrains.kotlin.kapt'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 apply from: "../gradle_scripts/code_quality.gradle"
 
@@ -64,28 +67,28 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
 
-    kapt {
-        arguments {
-            arg("room.schemaLocation", "$rootDir/ultrasonic/schemas".toString())
-        }
+    ksp {
+        arg("room.schemaLocation", "$rootDir/ultrasonic/schemas")
     }
 
     lint {
         baseline = file("lint-baseline.xml")
         abortOnError true
         warningsAsErrors true
-        disable 'IconMissingDensityFolder', 'VectorPath'
-        ignore 'MissingTranslation', 'UnusedQuantity', 'MissingQuantity'
         warning 'ImpliedQuantity'
+        disable 'IconMissingDensityFolder', 'VectorPath'
+        disable 'MissingTranslation', 'UnusedQuantity', 'MissingQuantity'
         disable 'ObsoleteLintCustomCheck'
+        // We manage dependencies on Gitlab with RenovateBot
+        disable 'GradleDependency'
         textReport true
         checkDependencies true
     }
     namespace 'org.moire.ultrasonic'
 
 }
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
     useJUnitPlatform()
 }
 
@@ -129,7 +132,7 @@ dependencies {
     implementation libs.rxAndroid
     implementation libs.multiType
 
-    kapt libs.room
+    ksp libs.room
 
     testImplementation libs.kotlinReflect
     testImplementation libs.junit
@@ -141,6 +144,5 @@ dependencies {
     testImplementation libs.robolectric
 
     implementation libs.timber
-
 }