From 5bf974eb0c6f3d8c9930b605b1af6d6823185612 Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Sat, 6 Jul 2024 14:01:58 +0200 Subject: [PATCH] Replace kapt by ksp --- app/build.gradle.kts | 2 +- build.gradle.kts | 6 +++++- db/build.gradle.kts | 22 +++++----------------- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6b5485e9..bfa0ad45 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -36,7 +36,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.4.0" + kotlinCompilerExtensionVersion = "1.5.3" } lint { diff --git a/build.gradle.kts b/build.gradle.kts index a3e6aded..f3728984 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ import com.android.build.gradle.LibraryPlugin import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile buildscript { - val kotlin_version = "1.8.0" + val kotlin_version = "1.9.10" repositories { google() @@ -19,6 +19,10 @@ buildscript { } } +plugins { + id("com.google.devtools.ksp") version "1.9.10-1.0.13" apply false +} + allprojects { //apply("jacoco") diff --git a/db/build.gradle.kts b/db/build.gradle.kts index 60f51833..47c624e0 100644 --- a/db/build.gradle.kts +++ b/db/build.gradle.kts @@ -1,23 +1,14 @@ plugins { id("com.android.library") kotlin("android") - kotlin("kapt") kotlin("plugin.parcelize") + id("com.google.devtools.ksp") } android { namespace = "com.readrops.db" defaultConfig { - javaCompileOptions { - annotationProcessorOptions { - arguments += mapOf( - "room.incremental" to "true", - "room.schemaLocation" to "$projectDir/schemas".toString() - ) - } - } - consumerProguardFiles("consumer-rules.pro") } @@ -32,12 +23,9 @@ android { } } -// Needed for kapt starting with kotlin plugin 1.5 -kapt { - arguments { - arg("room.schemaLocation", "$projectDir/schemas") - arg("room.incremental", "true") - } +ksp { + arg("room.schemaLocation", "$projectDir/schemas") + arg("room.incremental", "true") } dependencies { @@ -50,7 +38,7 @@ dependencies { androidTestImplementation(libs.bundles.test) implementation(libs.bundles.room) - kapt(libs.room.compiler) + ksp(libs.room.compiler) androidTestImplementation(libs.room.testing) implementation(libs.bundles.paging)