From fb0f9bc905eb552fe81efec6493c7a423850e9c8 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Wed, 3 Sep 2025 21:51:39 +0200 Subject: [PATCH] Cleanup after previous merge --- build-logic/convention/build.gradle.kts | 2 +- gradle/libs.versions.toml | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index b3fcb0724..09410445b 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -37,7 +37,7 @@ kotlin { } dependencies { - compileOnly(libs.android.gradleApiPlugin) + compileOnly(libs.android.gradle) compileOnly(libs.android.tools.common) compileOnly(plugin(libs.plugins.android.application)) compileOnly(plugin(libs.plugins.android.library)) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5b97c7c36..e79c60cf5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -157,14 +157,8 @@ truth = { module = "com.google.truth:truth", version.ref = "truth" } turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" } # Dependencies of the included build-logic -android-gradleApiPlugin = { group = "com.android.tools.build", name = "gradle-api", version.ref = "androidGradlePlugin" } +android-gradle = { module = "com.android.tools.build:gradle-api", version.ref = "androidGradlePlugin" } android-tools-common = { module = "com.android.tools:common", version.ref = "androidTools" } -compose-gradlePlugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" } -firebase-crashlytics-gradlePlugin = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsPlugin" } -firebase-performance-gradlePlugin = { group = "com.google.firebase", name = "perf-plugin", version.ref = "firebasePerfPlugin" } -kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" } -ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" } -room-gradlePlugin = { group = "androidx.room", name = "room-gradle-plugin", version.ref = "room" } [plugins] android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }