From 4f26275ec754ba32afb85ccf38624ddcb6905929 Mon Sep 17 00:00:00 2001 From: Syer10 Date: Tue, 5 Apr 2022 21:49:04 -0400 Subject: [PATCH] Improve how gradle plugin dependencies are handled --- android/build.gradle.kts | 13 +++++++------ build.gradle.kts | 2 +- core/build.gradle.kts | 11 ++++++----- data/build.gradle.kts | 13 +++++++------ desktop/build.gradle.kts | 13 +++++++------ gradle/libs.versions.toml | 2 ++ i18n/build.gradle.kts | 9 +++++---- presentation/build.gradle.kts | 13 +++++++------ ui-core/build.gradle.kts | 11 ++++++----- 9 files changed, 48 insertions(+), 39 deletions(-) diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 73ba1014..c50584f6 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -1,13 +1,14 @@ import Config.migrationCode import org.jetbrains.compose.compose +@Suppress("DSL_SCOPE_VIOLATION") plugins { - kotlin("android") - id("com.android.application") - id("org.jetbrains.compose") - id("com.google.devtools.ksp") - id("org.jmailen.kotlinter") - id("com.mikepenz.aboutlibraries.plugin") + id(libs.plugins.kotlin.android.get().pluginId) + id(libs.plugins.android.application.get().pluginId) + id(libs.plugins.ksp.get().pluginId) + id(libs.plugins.compose.get().pluginId) + id(libs.plugins.kotlinter.get().pluginId) + id(libs.plugins.aboutLibraries.get().pluginId) } dependencies { diff --git a/build.gradle.kts b/build.gradle.kts index 2c7d204a..7c21d1b8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,8 +3,8 @@ import Config.serverCode import Config.tachideskVersion import com.codingfeline.buildkonfig.compiler.FieldSpec.Type +@Suppress("DSL_SCOPE_VIOLATION") plugins { - val libs = libs alias(libs.plugins.kotlin.multiplatform) apply false alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.android.library) apply false diff --git a/core/build.gradle.kts b/core/build.gradle.kts index c9a68e23..a00f58ca 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -1,9 +1,10 @@ +@Suppress("DSL_SCOPE_VIOLATION") plugins { - kotlin("multiplatform") - id("com.android.library") - id("com.google.devtools.ksp") - id("com.codingfeline.buildkonfig") - id("org.jmailen.kotlinter") + id(libs.plugins.kotlin.multiplatform.get().pluginId) + id(libs.plugins.android.library.get().pluginId) + id(libs.plugins.ksp.get().pluginId) + id(libs.plugins.buildkonfig.get().pluginId) + id(libs.plugins.kotlinter.get().pluginId) } group = "ca.gosyer" diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 4158b562..5190c3ff 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -1,10 +1,11 @@ +@Suppress("DSL_SCOPE_VIOLATION") plugins { - kotlin("multiplatform") - id("com.google.devtools.ksp") - kotlin("plugin.serialization") - id("com.android.library") - id("com.codingfeline.buildkonfig") - id("org.jmailen.kotlinter") + id(libs.plugins.kotlin.multiplatform.get().pluginId) + id(libs.plugins.kotlin.serialization.get().pluginId) + id(libs.plugins.android.library.get().pluginId) + id(libs.plugins.ksp.get().pluginId) + id(libs.plugins.buildkonfig.get().pluginId) + id(libs.plugins.kotlinter.get().pluginId) } kotlin { diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index e5272b94..411b9a0a 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -7,13 +7,14 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import proguard.gradle.ProGuardTask +@Suppress("DSL_SCOPE_VIOLATION") plugins { - kotlin("jvm") - id("org.jetbrains.compose") - id("com.google.devtools.ksp") - id("com.github.gmazzo.buildconfig") - id("org.jmailen.kotlinter") - id("com.mikepenz.aboutlibraries.plugin") + id(libs.plugins.kotlin.jvm.get().pluginId) + id(libs.plugins.ksp.get().pluginId) + id(libs.plugins.compose.get().pluginId) + id(libs.plugins.buildconfig.get().pluginId) + id(libs.plugins.kotlinter.get().pluginId) + id(libs.plugins.aboutLibraries.get().pluginId) } dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 63d427e1..7bc63f5f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -154,6 +154,8 @@ proguard = { module = "com.guardsquare:proguard-gradle", version.ref = "proguard [plugins] # Kotlin kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin"} +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin"} +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin"} kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin"} # Android diff --git a/i18n/build.gradle.kts b/i18n/build.gradle.kts index 40b56a13..9099e59b 100644 --- a/i18n/build.gradle.kts +++ b/i18n/build.gradle.kts @@ -1,10 +1,11 @@ import org.jetbrains.compose.compose +@Suppress("DSL_SCOPE_VIOLATION") plugins { - kotlin("multiplatform") - id("com.android.library") - id("dev.icerock.mobile.multiplatform-resources") - id("org.jetbrains.compose") + id(libs.plugins.kotlin.multiplatform.get().pluginId) + id(libs.plugins.android.library.get().pluginId) + id(libs.plugins.moko.gradle.get().pluginId) + id(libs.plugins.compose.get().pluginId) } kotlin { diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts index 21ecb947..e9da3b8e 100644 --- a/presentation/build.gradle.kts +++ b/presentation/build.gradle.kts @@ -1,12 +1,13 @@ import org.jetbrains.compose.compose +@Suppress("DSL_SCOPE_VIOLATION") plugins { - kotlin("multiplatform") - id("com.android.library") - id("com.google.devtools.ksp") - id("org.jetbrains.compose") - id("com.codingfeline.buildkonfig") - id("org.jmailen.kotlinter") + id(libs.plugins.kotlin.multiplatform.get().pluginId) + id(libs.plugins.android.library.get().pluginId) + id(libs.plugins.ksp.get().pluginId) + id(libs.plugins.compose.get().pluginId) + id(libs.plugins.buildkonfig.get().pluginId) + id(libs.plugins.kotlinter.get().pluginId) } kotlin { diff --git a/ui-core/build.gradle.kts b/ui-core/build.gradle.kts index c19eb6fa..90c6f89c 100644 --- a/ui-core/build.gradle.kts +++ b/ui-core/build.gradle.kts @@ -1,11 +1,12 @@ import org.jetbrains.compose.compose +@Suppress("DSL_SCOPE_VIOLATION") plugins { - kotlin("multiplatform") - id("com.android.library") - id("org.jetbrains.compose") - id("com.codingfeline.buildkonfig") - id("org.jmailen.kotlinter") + id(libs.plugins.kotlin.multiplatform.get().pluginId) + id(libs.plugins.android.library.get().pluginId) + id(libs.plugins.compose.get().pluginId) + id(libs.plugins.buildkonfig.get().pluginId) + id(libs.plugins.kotlinter.get().pluginId) } kotlin {