Use version catalog in sample

badoo · Aug 2, 2024 · ae7b2a1 · ae7b2a1
1 parent 325859c
commit ae7b2a1
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 47 deletions.
diff --git a/sample/app/build.gradle.kts b/sample/app/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("com.badoo.marathon")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.marathon)
 }
 
 android {
@@ -33,8 +33,9 @@ android {
 }
 
 dependencies {
-    implementation(Libraries.appCompat)
-    implementation(Libraries.constraintLayout)
-    androidTestImplementation(TestLibraries.androidxTestRunner)
-    androidTestImplementation(TestLibraries.androidxTestJUnit)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.constraintlayout)
+
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.androidx.test.junit)
 }
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.application") apply false
-    id("com.android.library") apply false
-    id("org.jetbrains.kotlin.android") apply false
-    id("com.badoo.marathon")
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.marathon)
 }
diff --git a/sample/buildSrc/build.gradle.kts b/sample/buildSrc/build.gradle.kts
diff --git a/sample/buildSrc/src/main/kotlin/Versions.kt b/sample/buildSrc/src/main/kotlin/Versions.kt
diff --git a/sample/gradle/libs.versions.toml b/sample/gradle/libs.versions.toml
@@ -0,0 +1,19 @@
+[versions]
+android-gradle-plugin = "8.5.1"
+androidx-appcompat = "1.7.0"
+androidx-constraintlayout = "2.1.4"
+androidx-test = "1.6.1"
+androidx-test-junit = "1.2.1"
+kotlin-gradle-plugin = "1.9.24"
+
+[libraries]
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
+androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
+androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }
+androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
+android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-gradle-plugin" }
+marathon = { id = "com.badoo.marathon" }
diff --git a/sample/library/build.gradle.kts b/sample/library/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("com.badoo.marathon")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.marathon)
 }
 
 android {
@@ -29,8 +29,9 @@ android {
 }
 
 dependencies {
-    implementation(Libraries.appCompat)
-    implementation(Libraries.constraintLayout)
-    androidTestImplementation(TestLibraries.androidxTestRunner)
-    androidTestImplementation(TestLibraries.androidxTestJUnit)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.constraintlayout)
+
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.androidx.test.junit)
 }
diff --git a/sample/settings.gradle b/sample/settings.gradle
@@ -5,12 +5,6 @@ pluginManagement {
         google()
         maven { url "https://jitpack.io" }
     }
-    plugins {
-        id "com.android.application" version "$androidPluginVersion"
-        id "com.android.library" version "$androidPluginVersion"
-        id "org.jetbrains.kotlin.android" version "$kotlinVersion"
-    }
-
     includeBuild("..")
 }