Skip to content
Snippets Groups Projects
Unverified Commit 2bea39e5 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

chore: replace kapt with ksp

parent 8aedf173
No related branches found
No related tags found
No related merge requests found
...@@ -119,8 +119,8 @@ dependencies { ...@@ -119,8 +119,8 @@ dependencies {
// Dependency Injection // Dependency Injection
implementation(libs.dagger.core) implementation(libs.dagger.core)
kapt(libs.dagger.compiler) ksp(libs.dagger.compiler)
kapt(libs.dagger.processor) ksp(libs.dagger.processor)
implementation(libs.dagger.android.core) implementation(libs.dagger.android.core)
implementation(libs.dagger.android.support) implementation(libs.dagger.android.support)
......
...@@ -29,7 +29,6 @@ buildscript { ...@@ -29,7 +29,6 @@ buildscript {
plugins { plugins {
alias(libs.plugins.android.application) apply false alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.jvm) apply false alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.kotlin.kapt) apply false
alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.kotlin.serialization) apply false
alias(libs.plugins.ksp) apply false alias(libs.plugins.ksp) apply false
} }
...@@ -4,20 +4,16 @@ import org.gradle.api.Project ...@@ -4,20 +4,16 @@ import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.tasks.testing.Test import org.gradle.api.tasks.testing.Test
import org.gradle.jvm.toolchain.JavaLanguageVersion import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.gradle.jvm.toolchain.JavaToolchainService
import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.provideDelegate import org.gradle.kotlin.dsl.provideDelegate
import org.gradle.kotlin.dsl.withType import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.UsesKotlinJavaToolchain
class KotlinAndroidConvention : Plugin<Project> { class KotlinAndroidConvention : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
with(pluginManager) { with(pluginManager) {
apply("org.jetbrains.kotlin.android") apply("org.jetbrains.kotlin.android")
apply("org.jetbrains.kotlin.kapt")
apply("com.google.devtools.ksp") apply("com.google.devtools.ksp")
apply("org.jetbrains.kotlin.plugin.serialization") apply("org.jetbrains.kotlin.plugin.serialization")
} }
......
...@@ -4,25 +4,16 @@ import org.gradle.api.Project ...@@ -4,25 +4,16 @@ import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.tasks.testing.Test import org.gradle.api.tasks.testing.Test
import org.gradle.jvm.toolchain.JavaLanguageVersion import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.gradle.jvm.toolchain.JavaToolchainService
import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.kotlin
import org.gradle.kotlin.dsl.provideDelegate import org.gradle.kotlin.dsl.provideDelegate
import org.gradle.kotlin.dsl.withType import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask
import org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.UsesKotlinJavaToolchain
class KotlinConvention : Plugin<Project> { class KotlinConvention : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
with(target) { with(target) {
with(pluginManager) { with(pluginManager) {
apply("org.jetbrains.kotlin.jvm") apply("org.jetbrains.kotlin.jvm")
apply("org.jetbrains.kotlin.kapt")
apply("com.google.devtools.ksp") apply("com.google.devtools.ksp")
apply("org.jetbrains.kotlin.plugin.serialization") apply("org.jetbrains.kotlin.plugin.serialization")
} }
......
...@@ -5,7 +5,7 @@ androidx-espresso = "3.6.1" ...@@ -5,7 +5,7 @@ androidx-espresso = "3.6.1"
androidx-lifecycle = "2.8.7" androidx-lifecycle = "2.8.7"
androidx-room = "2.6.1" androidx-room = "2.6.1"
androidx-test = "1.6.2" androidx-test = "1.6.2"
dagger = "2.47" dagger = "2.52"
glide = "4.16.0" glide = "4.16.0"
kotlin = "2.0.21" kotlin = "2.0.21"
kotlinx-serialization = "1.7.3" kotlinx-serialization = "1.7.3"
...@@ -98,6 +98,5 @@ android-application = { id = "com.android.application", version.ref = "android-g ...@@ -98,6 +98,5 @@ android-application = { id = "com.android.application", version.ref = "android-g
android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" } android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
android-test = { id = "com.android.test", version.ref = "android-gradle-plugin" } android-test = { id = "com.android.test", version.ref = "android-gradle-plugin" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment