From f63ad611baf03d087df4c197bba025863caa6bcf Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sat, 30 Jul 2022 23:04:45 +0200 Subject: [PATCH] Use version catalog for root plugins --- build.gradle.kts | 14 +++++++------- buildSrc/src/main/kotlin/Dependencies.kt | 12 ------------ gradle/libs.versions.toml | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/build.gradle.kts b/build.gradle.kts index 5dde6f6..909367e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,13 +6,13 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:${Dependencies.androidPluginVersion}") - classpath("com.google.gms:google-services:${Dependencies.googleServicesVersion}") - classpath("com.google.firebase:firebase-crashlytics-gradle:${Dependencies.crashlyticsVersion}") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Dependencies.kotlinVersion}") - classpath("org.jetbrains.kotlin:kotlin-serialization:${Dependencies.kotlinVersion}") - classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${Dependencies.navVersion}") - classpath("com.google.dagger:hilt-android-gradle-plugin:${Dependencies.hiltVersion}") + classpath(libs.android.gradlePlugin) + classpath(libs.google.servicesPlugin) + classpath(libs.firebase.crashlyticsPlugin) + classpath(libs.jetbrains.kotlinPlugin) + classpath(libs.jetbrains.serializationPlugin) + classpath(libs.navigation.safeArgsPlugin) + classpath(libs.dagger.hiltPlugin) } } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 91842ec..457faa2 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -15,18 +15,6 @@ object Dependencies { // https://dagger.dev/hilt/gradle-setup const val hiltVersion = "2.43.1" - // https://kotlinlang.org/docs/gradle.html - const val kotlinVersion = "1.7.10" - - // https://maven.google.com/web/index.html?q=com.android.tools.build#com.android.tools.build:gradle - const val androidPluginVersion = "7.2.1" - - // https://developers.google.com/android/guides/google-services-plugin - const val googleServicesVersion = "4.3.13" - - // https://mvnrepository.com/artifact/com.google.firebase/firebase-crashlytics-gradle - const val crashlyticsVersion = "2.9.1" - // https://plugins.gradle.org/plugin/org.sonarqube const val sonarqubeVersion = "3.4.0.2513" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..630f7ac --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,22 @@ +[versions] +# https://maven.google.com/web/index.html?q=com.android.tools.build#com.android.tools.build:gradle +androidGradlePlugin = "7.2.1" +# https://developers.google.com/android/guides/google-services-plugin +googleServicesPlugin = "4.3.13" +# https://mvnrepository.com/artifact/com.google.firebase/firebase-crashlytics-gradle +firebaseCrashlytics = "2.9.1" +# https://kotlinlang.org/docs/gradle.html +kotlin = "1.7.10" +# https://developer.android.com/jetpack/androidx/releases/navigation +googleNavigation = "2.5.1" +# https://dagger.dev/hilt/gradle-setup +hilt = "2.43.1" + +[libraries] +android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" } +google-servicesPlugin = { group = "com.google.gms", name = "google-services", version.ref = "googleServicesPlugin" } +firebase-crashlyticsPlugin = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "firebaseCrashlytics" } +jetbrains-kotlinPlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" } +jetbrains-serializationPlugin = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin" } +navigation-safeArgsPlugin = { group = "androidx.navigation", name = "navigation-safe-args-gradle-plugin", version.ref = "googleNavigation" } +dagger-hiltPlugin = { group = "com.google.dagger", name = "hilt-android-gradle-plugin", version.ref = "hilt" }