From 1b24d2d7ae01a01148e98cbc873fabeaa5076a93 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sun, 7 Jul 2024 00:55:30 +0530 Subject: [PATCH] Plugin & Deps: Migrated `ksp` to Version Catlog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- WordPress/build.gradle | 2 +- build.gradle | 2 +- gradle/libs.versions.toml | 3 +++ libs/processors/build.gradle | 2 +- settings.gradle | 2 -- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 1a07143f75a4..4ac759a41035 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -12,7 +12,7 @@ plugins { id "com.google.gms.google-services" alias(libs.plugins.dagger) alias(libs.plugins.kover) - id "com.google.devtools.ksp" + alias(libs.plugins.ksp) } sentry { diff --git a/build.gradle b/build.gradle index 8aa8142d3dea..29e2cc55f260 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ plugins { id "com.android.library" apply false id 'com.google.gms.google-services' apply false id "org.jetbrains.kotlin.plugin.parcelize" apply false - id "com.google.devtools.ksp" apply false + alias(libs.plugins.ksp).apply(false) } ext { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d0be1aef199c..8eb75f567bb0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -55,6 +55,7 @@ jsoup = '1.16.2' junit = '4.13.2' kotlinxCoroutines = '1.7.3' kover = "0.7.5" +ksp = "1.9.22-1.0.17" lottie = '6.1.0' measureBuilds = '2.1.2' mockitoAndroid = '4.5.1' @@ -185,6 +186,7 @@ junit = { group = "junit", name = "junit", version.ref ="junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref ="kotlinxCoroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref ="kotlinxCoroutines" } kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref ="kotlinxCoroutines" } +ksp-sympol-processing-api = { group = "com.google.devtools.ksp", name = "symbol-processing-api", version.ref = "ksp" } lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottie" } lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottie" } mockito-android = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroid" } @@ -208,6 +210,7 @@ dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "measureBuilds" } navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } diff --git a/libs/processors/build.gradle b/libs/processors/build.gradle index eb8ee2f3703a..dcdc5757523d 100644 --- a/libs/processors/build.gradle +++ b/libs/processors/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation libs.squareup.kotlinpoet implementation libs.squareup.kotlinpoet.ksp - implementation "com.google.devtools.ksp:symbol-processing-api:$gradle.ext.kspVersion" + implementation libs.ksp.sympol.processing.api def kctVersion = "1.5.0" testImplementation "com.github.tschuchortdev:kotlin-compile-testing:$kctVersion" diff --git a/settings.gradle b/settings.gradle index 22f804192801..4e972a62ac0f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ pluginManagement { gradle.ext.kotlinVersion = '1.9.22' - gradle.ext.kspVersion = '1.9.22-1.0.17' gradle.ext.agpVersion = '8.1.0' gradle.ext.googleServicesVersion = '4.3.15' gradle.ext.violationCommentsVersion = '1.70.0' @@ -15,7 +14,6 @@ pluginManagement { id "com.android.library" version gradle.ext.agpVersion id 'com.google.gms.google-services' version gradle.ext.googleServicesVersion id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" version gradle.ext.violationCommentsVersion - id "com.google.devtools.ksp" version gradle.ext.kspVersion } repositories { maven {