MS-475 Enable K2 compiler

build-logic/convention/build.gradle.kts

@@ -13,6 +13,8 @@ dependencies {
     compileOnly(libs.plugin.firebase.perf)
     // Protobuf
     compileOnly(libs.plugin.protobuf)
+    // Room
+    compileOnly(libs.plugin.room)
     // Hilt
     compileOnly(libs.plugin.hilt)
     // Android X Navigation components

build-logic/convention/src/main/kotlin/LibraryHiltConventionPlugin.kt

@@ -1,41 +1,30 @@
 import common.getLibs
 import common.implementation
-import common.kapt
-import common.kaptAndroidTest
-import common.kaptTest
+import common.ksp
+import common.kspAndroidTest
+import common.kspTest
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import org.jetbrains.kotlin.gradle.plugin.KaptExtension
 
 class LibraryHiltConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             with(pluginManager) {
                 apply("dagger.hilt.android.plugin")
-                // KAPT must go last to avoid build warnings.
-                // See: https://stackoverflow.com/questions/70550883/warning-the-following-options-were-not-recognized-by-any-processor-dagger-f
-                apply("org.jetbrains.kotlin.kapt")
-            }
-
-            extensions.configure<KaptExtension> {
-                useBuildCache = true
-                arguments {
-                    arg("realm.ignoreKotlinNullability", true)
-                }
+                apply("com.google.devtools.ksp")
             }
 
             val libs = getLibs()
             dependencies {
                 implementation(libs, "hilt")
                 implementation(libs, "hilt.work")
 
-                kapt(libs, "hilt.kapt")
-                kapt(libs, "hilt.compiler")
+                ksp(libs, "hilt.dagger.compiler")
+                ksp(libs, "hilt.compiler")
 
-                kaptTest(libs, "testing.hilt.kapt")
-                kaptAndroidTest(libs, "testing.hilt.kapt")
+                kspTest(libs, "testing.hilt.compiler")
+                kspAndroidTest(libs, "testing.hilt.compiler")
             }
         }
     }

build-logic/convention/src/main/kotlin/LibraryProtobufConventionPlugin.kt

@@ -1,10 +1,13 @@
+import com.android.build.api.variant.AndroidComponentsExtension
+import com.google.protobuf.gradle.GenerateProtoTask
 import com.google.protobuf.gradle.ProtobufExtension
 import common.getLibs
 import common.implementation
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
+import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompileTool
 
 class LibraryProtobufConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -30,6 +33,22 @@ class LibraryProtobufConventionPlugin : Plugin<Project> {
             dependencies {
                 implementation(libs, "protobuf")
             }
+
+            // Fox for known issue with KSP and protobuf
+            // https://github.com/google/ksp/issues/1590#issuecomment-1826387452
+            project.extensions.getByType(AndroidComponentsExtension::class.java).onVariants { variant ->
+                afterEvaluate {
+                    val variantName = variant.name.replaceFirstChar { it.uppercaseChar() }
+                    val generateTaskName = "generate${variantName}Proto"
+                    val kspTaskName = "ksp${variantName}Kotlin"
+
+                    val protoTask = project.tasks.getByName(generateTaskName) as GenerateProtoTask
+                    project.tasks.getByName(kspTaskName) {
+                        dependsOn(protoTask)
+                        (this as AbstractKotlinCompileTool<*>).setSource(protoTask.outputBaseDir)
+                    }
+                }
+            }
         }
     }
 }

build-logic/convention/src/main/kotlin/LibraryRoomConventionPlugin.kt

@@ -2,33 +2,30 @@ import com.android.build.api.dsl.LibraryExtension
 import common.configureDbEncryptionBuild
 import common.getLibs
 import common.implementation
-import common.kapt
+import common.ksp
 import common.testImplementation
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-
+import androidx.room.gradle.RoomExtension
 
 class LibraryRoomConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             with(pluginManager) {
-                apply("org.jetbrains.kotlin.kapt")
+                apply("androidx.room")
+                apply("com.google.devtools.ksp")
             }
 
             configureDbEncryptionBuild()
 
-            extensions.configure<LibraryExtension> {
-                defaultConfig {
-                    javaCompileOptions {
-                        annotationProcessorOptions {
-                            //Required by Room to be able to export the db schemas
-                            arguments += mapOf("room.schemaLocation" to "$projectDir/schemas")
-                        }
-                    }
-                }
+            extensions.configure<RoomExtension> {
+                //Required by Room to be able to export the db schemas
+                schemaDirectory("$projectDir/schemas")
+            }
 
+            extensions.configure<LibraryExtension> {
                 sourceSets {
                     getByName("debug") {
                         assets.srcDirs("$projectDir/schemas")
@@ -43,7 +40,7 @@ class LibraryRoomConventionPlugin : Plugin<Project> {
             dependencies {
                 implementation(libs, "androidX.Room.core")
                 implementation(libs, "androidX.Room.ktx")
-                kapt(libs, "androidX.Room.compiler")
+                ksp(libs, "androidX.Room.compiler")
 
                 implementation(libs, "sqlCipher.core")
 

build-logic/convention/src/main/kotlin/common/DependencyExt.kt

@@ -27,14 +27,14 @@ internal fun DependencyHandlerScope.androidTestImplementation(libs: VersionCatal
     add("androidTestImplementation", libs.findLibrary(name).get())
 }
 
-internal fun DependencyHandlerScope.kapt(libs: VersionCatalog, name: String) {
-    add("kapt", libs.findLibrary(name).get())
+internal fun DependencyHandlerScope.ksp(libs: VersionCatalog, name: String) {
+    add("ksp", libs.findLibrary(name).get())
 }
 
-internal fun DependencyHandlerScope.kaptTest(libs: VersionCatalog, name: String) {
-    add("kaptTest", libs.findLibrary(name).get())
+internal fun DependencyHandlerScope.kspTest(libs: VersionCatalog, name: String) {
+    add("kspTest", libs.findLibrary(name).get())
 }
 
-internal fun DependencyHandlerScope.kaptAndroidTest(libs: VersionCatalog, name: String) {
-    add("kaptAndroidTest", libs.findLibrary(name).get())
+internal fun DependencyHandlerScope.kspAndroidTest(libs: VersionCatalog, name: String) {
+    add("kspAndroidTest", libs.findLibrary(name).get())
 }

build-logic/convention/src/main/kotlin/common/KotlinAndroid.kt

@@ -1,9 +1,9 @@
 package common
 
 import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.variant.AndroidComponentsExtension
 import org.gradle.api.Project
-import org.gradle.api.plugins.ExtensionAware
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 /**
  * Configure base Kotlin with Android options
@@ -23,22 +23,23 @@ internal fun Project.configureKotlinAndroid(
             targetCompatibility = SdkVersions.JAVA_TARGET
         }
 
-        kotlinOptions {
-            freeCompilerArgs = freeCompilerArgs + listOf(
-                "-Xnew-inference",
-                "-opt-in=kotlin.RequiresOptIn",
-                // Enable experimental coroutines APIs, including Flow
-                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                "-opt-in=kotlinx.coroutines.FlowPreview",
-                "-opt-in=kotlin.Experimental",
-            )
 
-            // Set JVM target to version
-            jvmTarget = SdkVersions.JAVA_TARGET.toString()
+        extensions.getByType(AndroidComponentsExtension::class.java).onVariants { variant ->
+            afterEvaluate {
+                val variantName = variant.name.replaceFirstChar { it.uppercaseChar() }
+                val compileTaskName = "compile${variantName}Kotlin"
+
+                tasks.named(compileTaskName, KotlinCompilationTask::class.java) {
+                    compilerOptions.freeCompilerArgs.addAll(
+                        "-Xnew-inference",
+                        "-opt-in=kotlin.RequiresOptIn",
+                        // Enable experimental coroutines APIs, including Flow
+                        "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+                        "-opt-in=kotlinx.coroutines.FlowPreview",
+                        "-opt-in=kotlin.Experimental",
+                    )
+                }
+            }
         }
     }
 }
-
-fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
-    (this as ExtensionAware).extensions.configure("kotlinOptions", block)
-}

build.gradle.kts

@@ -4,11 +4,13 @@ plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.android.test) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.ksp) apply false
 
     alias(libs.plugins.realm) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.protobuf) apply false
     alias(libs.plugins.navigation.args) apply false
+    alias(libs.plugins.room) apply false
 
     alias(libs.plugins.gms) apply false
     alias(libs.plugins.firebase.crashlytics) apply false

gradle/libs.versions.toml

@@ -1,6 +1,7 @@
 [versions]
 kotlin_version = "2.0.0"
 kotlin_coroutine_version = "1.8.1"
+ksp_version = "2.0.0-1.0.22"
 
 android_gradlePlugin_version = "8.5.0"
 androidx_version = "1.5.2"
@@ -210,11 +211,11 @@ secugen = { module = "com.simprints:secugenwrapper", version.ref = "secugen_vers
 
 #hilt
 hilt = { module = "com.google.dagger:hilt-android", version.ref = "hilt_version" }
-hilt-kapt = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt_version" }
+hilt-dagger-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt_version" }
 hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hilt_androidx_version" }
 hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "hilt_androidx_version" }
 testing-hilt = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt_version" }
-testing-hilt-kapt = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt_version" }
+testing-hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt_version" }
 
 #Datastore
 datastore = { module = "androidx.datastore:datastore", version.ref = "androidx_datastore_version" }
@@ -270,13 +271,15 @@ plugin-firebase-distribution = { group = "com.google.firebase", name = "firebase
 plugin-sonar = { group = "org.sonarsource.scanner.gradle", name = "sonarqube-gradle-plugin", version.ref = "sonar_plugin_version" }
 plugin-jacoco = { group = "org.jacoco", name = "org.jacoco.core", version.ref = "jacoco_version" }
 plugin-retry = { group = "org.gradle", name = "test-retry-gradle-plugin", version.ref = "retry_version" }
+plugin-room = { group = "androidx.room", name = "room-gradle-plugin", version.ref = "androidx_room_version" }
 
 [plugins]
 
 android-application = { id = "com.android.application", version.ref = "android_gradlePlugin_version" }
 android-library = { id = "com.android.library", version.ref = "android_gradlePlugin_version" }
 android-test = { id = "com.android.test", version.ref = "android_gradlePlugin_version" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin_version" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp_version" }
 gms = { id = "com.google.gms.google-services", version.ref = "gsm_plugin_version" }
 firebase-perf = { id = "com.google.firebase.firebase-perf", version.ref = "firebase_perfPlugin_version" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase_crashlyticsPlugin_version" }
@@ -289,3 +292,4 @@ play-publisher = { id = "com.github.triplet.play", version.ref = "play_publisher
 retry = { id = "org.gradle.test-retry", version.ref = "retry_version" }
 sonar = { id = "org.sonarqube", version.ref = "sonar_plugin_version" }
 depsGraph = { id = "com.vanniktech.dependency.graph.generator", version.ref = "deps_graph_version" }
+room = { id = "androidx.room", version.ref = "androidx_room_version" }