diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 1d516662e..b7e957288 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -14,11 +14,6 @@ updates: registries: "*" labels: [ ] groups: - kotlin-ksp: - patterns: - - "org.jetbrains.kotlin:*" - - "org.jetbrains.kotlin.jvm" - - "com.google.devtools.ksp" android-build-tools: patterns: - "com.android.tools.build:*" diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 0f566fe43..93c620890 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -48,7 +48,6 @@ dependencies { compileOnly(gradleApi()) compileOnly(libs.gradlePlugins.android) compileOnly(libs.gradlePlugins.kotlin) - compileOnly(libs.gradlePlugins.ksp) compileOnly(libs.gradlePlugins.compose) compileOnly(libs.gradlePlugins.dependencyGuard) compileOnly(libs.gradlePlugins.dokka) @@ -66,7 +65,6 @@ gradlePlugin { create("com.adevinta.spark.SparkAndroidLintPlugin", id = "com.adevinta.spark.android-lint") create("com.adevinta.spark.SparkPublishingPlugin", id = "com.adevinta.spark.publishing") create("com.adevinta.spark.SparkKotlinJvmPlugin", id = "com.adevinta.spark.kotlin-jvm") - create("com.adevinta.spark.SparkKspPlugin", id = "com.adevinta.spark.ksp") create("com.adevinta.spark.SparkDokkaPlugin", id = "com.adevinta.spark.dokka") create("com.adevinta.spark.SparkDependencyGuardPlugin", id = "com.adevinta.spark.dependencyGuard") create("com.adevinta.spark.SparkSpotlessPlugin", id = "com.adevinta.spark.spotless") diff --git a/build-logic/src/main/kotlin/com/adevinta/spark/SparkKspPlugin.kt b/build-logic/src/main/kotlin/com/adevinta/spark/SparkKspPlugin.kt deleted file mode 100644 index aa507b685..000000000 --- a/build-logic/src/main/kotlin/com/adevinta/spark/SparkKspPlugin.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2023 Adevinta - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.adevinta.spark - -import com.google.devtools.ksp.gradle.KspExtension -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.kotlin.dsl.apply -import org.gradle.kotlin.dsl.configure - -internal class SparkKspPlugin : Plugin { - override fun apply(target: Project) { - with(target) { - apply(plugin = "com.google.devtools.ksp") - - pluginManager.withPlugin("com.adevinta.spark.android-compose") { - configure { - arg("skipPrivatePreviews", "true") - } - } - } - } -} diff --git a/build.gradle.kts b/build.gradle.kts index cfa93c03f..f804c7027 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,6 @@ plugins { alias(libs.plugins.android.lint) apply false alias(libs.plugins.android.kotlin) apply false alias(libs.plugins.kotlin.jvm) apply false - alias(libs.plugins.google.ksp) apply false alias(libs.plugins.paparazzi) apply false alias(libs.plugins.dokka) apply false alias(libs.plugins.dependencyGuard) apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1cd7aef00..6e96463ca 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,6 @@ kotlin = "2.0.20" kotlinx-coroutines = "1.9.0" kotlinx-collections-immutable = "0.3.8" kotlinx-serialization-json = "1.7.3" -ksp = "2.0.20-1.0.25" ktlint = "1.2.1" lint = "31.7.1" minCompileSdk = "24" @@ -90,7 +89,6 @@ gradlePlugins-compose = { module = "org.jetbrains.kotlin:compose-compiler-gradle gradlePlugins-dependencyGuard = { module = "com.dropbox.dependency-guard:com.dropbox.dependency-guard.gradle.plugin", version.ref = "dependencyGuard" } gradlePlugins-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" } gradlePlugins-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } -gradlePlugins-ksp = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" } gradlePlugins-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" } junit = { module = "junit:junit", version.ref = "junit" } @@ -130,6 +128,5 @@ paparazzi = { id = "app.cash.paparazzi", version.ref = "paparazzi" } dependencyGuard = { id = "com.dropbox.dependency-guard", version.ref = "dependencyGuard" } dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -google-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } diff --git a/spark-screenshot-testing/build.gradle.kts b/spark-screenshot-testing/build.gradle.kts index 66b177678..33575bb1e 100644 --- a/spark-screenshot-testing/build.gradle.kts +++ b/spark-screenshot-testing/build.gradle.kts @@ -22,7 +22,6 @@ plugins { id("com.adevinta.spark.android-library") id("com.adevinta.spark.android-compose") - id("com.adevinta.spark.ksp") alias(libs.plugins.paparazzi) } diff --git a/spark/build.gradle.kts b/spark/build.gradle.kts index 724ebc6ab..80e044c21 100644 --- a/spark/build.gradle.kts +++ b/spark/build.gradle.kts @@ -22,7 +22,6 @@ plugins { id("com.adevinta.spark.android-library") id("com.adevinta.spark.android-compose") - id("com.adevinta.spark.ksp") id("com.adevinta.spark.dokka") id("com.adevinta.spark.publishing") id("com.adevinta.spark.dependencyGuard")