[#19] Version catalog

Electric-Coin-Company · Apr 21, 2022 · 93afba2 · 93afba2
1 parent 08fa562
commit 93afba2
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 60 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
diff --git a/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt b/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,17 @@
+[versions]
+kotlin = "1.6.21"
+kotest = "4.6.1"
+moshi = "1.9.2"
+
+[libraries]
+kotest-runner = { module = "io.kotest:kotest-runner-junit5-jvm", version.ref = "kotest" }
+kotest-assertion = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest" }
+kotest-property = { module = "io.kotest:kotest-property-jvm", version.ref = "kotest" }
+moshi-core = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
+moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
+
+[plugins]
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+dokka = "org.jetbrains.dokka:1.6.20"
+versions = "com.github.ben-manes.versions:0.42.0"
+publish = "com.vanniktech.maven.publish:0.18.0"
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -1,10 +1,8 @@
-import cash.z.ecc.android.Deps
-
 plugins {
-    id("org.jetbrains.kotlin.jvm")
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.kotlin)
     id("java-library")
-    id("com.vanniktech.maven.publish")
+    alias(libs.plugins.dokka)
+    alias(libs.plugins.publish)
 }
 
 group = project.property("GROUP").toString()
@@ -21,11 +19,11 @@ kotlin {
 dependencies {
     // Tests
     testImplementation(kotlin("test"))
-    testImplementation(Deps.Kotest.RUNNER)
-    testImplementation(Deps.Kotest.ASSERTIONS)
-    testImplementation(Deps.Kotest.PROPERTY)
-    testImplementation(Deps.Square.MOSHI)
-    testImplementation(Deps.Square.MOSHI_KOTLIN)
+    testImplementation(libs.kotest.runner)
+    testImplementation(libs.kotest.assertion)
+    testImplementation(libs.kotest.property)
+    testImplementation(libs.moshi.core)
+    testImplementation(libs.moshi.kotlin)
 }
 
 tasks.withType<Test> {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,14 +1,3 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-    }
-    plugins {
-        kotlin("jvm") version ("1.6.21") apply(false)
-        id("org.jetbrains.dokka") version ("0.10.1") apply (false)
-        id("com.vanniktech.maven.publish") version("0.14.2") apply (false)
-    }
-}
-
 dependencyResolutionManagement {
     repositories {
         google()