chore: Add version catalog to hold dependencies and versions

xyzwilliamxyz · xyzwilliamxyz · commit 8c60d2cc0afc · 2023-06-07T14:32:00.000-03:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,13 +1,13 @@
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version(Versions.GRADLE_PLUGIN).apply(false)
-    id("com.android.library").version(Versions.GRADLE_PLUGIN).apply(false)
-    id("com.vanniktech.maven.publish").version(Versions.PUBLISH_PLUGIN).apply(false)
-    id("io.gitlab.arturbosch.detekt").version(Versions.DETEKT_PLUGIN).apply(false)
-    id("org.jlleitschuh.gradle.ktlint").version(Versions.KTLINT_PLUGIN).apply(false)
-    id("org.jetbrains.kotlinx.kover").version(Versions.KOVER_PLUGIN).apply(false)
-    kotlin("android").version(Versions.KOTLIN).apply(false)
-    kotlin("multiplatform").version(Versions.KOTLIN).apply(false)
+    id("com.android.application") version libs.versions.gradlePlugin apply false
+    id("com.android.library").version(libs.versions.gradlePlugin).apply(false)
+    id("com.vanniktech.maven.publish").version(libs.versions.publishPlugin).apply(false)
+    id("io.gitlab.arturbosch.detekt").version(libs.versions.detektPlugin).apply(false)
+    id("org.jlleitschuh.gradle.ktlint").version(libs.versions.ktlintPlugin).apply(false)
+    id("org.jetbrains.kotlinx.kover").version(libs.versions.koverPlugin).apply(false)
+    kotlin("android").version(libs.versions.kotlin).apply(false)
+    kotlin("multiplatform").version(libs.versions.kotlin).apply(false)
 }
 
 tasks.register("clean", Delete::class) {
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,63 @@
+[versions]
+coil = "2.2.2"
+compose = "1.3.3"
+composeActivity = "1.6.1"
+composeFoundation = "1.3.1"
+composeLivedata = "1.3.3"
+composeNavigation = "2.5.3"
+config-compile-sdk-version = "33"
+config-min-sdk-version = "23"
+config-target-sdk-version = "33"
+detektPlugin = "1.22.0"
+gradlePlugin = "7.3.0"
+koin = "3.2.0"
+kotlin = "1.7.20"
+koverPlugin = "0.6.1"
+ktlintPlugin = "11.0.0"
+ktor = "2.2.2"
+mockk = "1.13.4"
+mockkCommon = "1.12.5"
+publishPlugin = "0.24.0"
+spmPlugin = "2.0.5-arm64"
+spring = "2.4.5"
+
+[libraries]
+# Spring
+spring-boot-dependencies = { group = "org.springframework.boot", name = "spring-boot-dependencies", version.ref = "spring" }
+spring-boot-web = { group = "org.springframework.boot", name = "spring-boot-starter-web" }
+
+#Network
+ktor-android = { group = "io.ktor", name = "ktor-client-android", version.ref = "ktor" }
+ktor-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
+ktor-darwin = { group = "io.ktor", name = "ktor-client-darwin", version.ref = "ktor" }
+ktor-ios = { group = "io.ktor", name = "ktor-client-ios", version.ref = "ktor" }
+ktor-logging = { group = "io.ktor", name = "ktor-client-logging", version.ref = "ktor" }
+ktor-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
+ktor-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktor" }
+ktor-serialization = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
+
+# DI
+koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
+koin-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin" }
+koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
+
+#UI
+androidx-compose-activity = { group = "androidx.activity", name = "activity-compose", version.ref = "composeActivity" }
+androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "composeFoundation" }
+androidx-compose-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata", version.ref = "composeLivedata" }
+androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "composeFoundation" }
+androidx-compose-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "composeNavigation" }
+androidx-compose-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "compose" }
+androidx-compose-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "compose" }
+coil = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
+
+#Test
+koin-test = { group = "io.insert-koin", name = "koin-test", version.ref = "koin" }
+ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock", version.ref = "ktor" }
+mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
+mockk-common = { group = "io.mockk", name = "mockk-common", version.ref = "mockkCommon" }
+mockk-jvm = { group = "io.mockk", name = "mockk-jvm", version.ref = "mockk" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "gradlePlugin" }
+android-library = { id = "com.android.library", version.ref = "gradlePlugin" }
diff --git a/sample/android/build.gradle.kts b/sample/android/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
 
 android {
     namespace = "co.yml.ychat.android"
-    compileSdk = Config.COMPILE_SDK_VERSION
+    compileSdk = libs.versions.config.compile.sdk.version.get().toInt()
     defaultConfig {
         applicationId = "co.yml.ychat.android"
-        minSdk = Config.MIN_SDK_VERSION
-        targetSdk = Config.TARGET_SDK_VERSION
+        minSdk = libs.versions.config.min.sdk.version.get().toInt()
+        targetSdk = libs.versions.config.target.sdk.version.get().toInt()
         versionCode = 1
         versionName = "1.0"
 
@@ -45,16 +45,15 @@ android {
 
 dependencies {
     implementation(project(":ychat"))
-    implementation(Dependencies.UI.COMPOSE_UI)
-    implementation(Dependencies.UI.COMPOSE_TOOLING)
-    implementation(Dependencies.UI.COMPOSE_TOOLING_PREVIEW)
-    implementation(Dependencies.UI.COMPOSE_FOUNDATION)
-    implementation(Dependencies.UI.COMPOSE_MATERIAL)
-    implementation(Dependencies.UI.COMPOSE_ACTIVITY)
-    implementation(Dependencies.UI.COMPOSE_NAVIGATION)
-    implementation(Dependencies.UI.COMPOSE_LIVEDATA)
-    implementation(Dependencies.UI.COIL)
-    implementation(Dependencies.DI.KOIN_CORE)
-    implementation(Dependencies.DI.KOIN_ANDROID)
-    implementation(Dependencies.DI.KOIN_COMPOSE)
+    implementation(libs.androidx.compose.tooling)
+    implementation(libs.androidx.compose.tooling.preview)
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.androidx.compose.material)
+    implementation(libs.androidx.compose.activity)
+    implementation(libs.androidx.compose.navigation)
+    implementation(libs.androidx.compose.livedata)
+    implementation(libs.coil)
+    implementation(libs.koin.core)
+    implementation(libs.koin.android)
+    implementation(libs.koin.compose)
 }
diff --git a/sample/jvm/build.gradle.kts b/sample/jvm/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot").version(Versions.SPRING)
+    id("org.springframework.boot").version(libs.versions.spring)
     java
 }
 
@@ -10,6 +10,6 @@ java {
 
 dependencies {
     implementation(project(":ychat"))
-    implementation(platform(Dependencies.Spring.SPRING_DEP))
-    implementation(Dependencies.Spring.SPRING_WEB)
+    implementation(platform(libs.spring.boot.dependencies))
+    implementation(libs.spring.boot.web)
 }
diff --git a/ychat-core/build.gradle.kts b/ychat-core/build.gradle.kts
@@ -37,23 +37,23 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(Dependencies.Network.KTOR_NEGOTIATION)
-                api(Dependencies.Network.KTOR_SERIALIZATION)
-                api(Dependencies.Network.KTOR_CORE)
-                api(Dependencies.Network.KTOR_LOGGING)
+                api(libs.ktor.negotiation)
+                api(libs.ktor.serialization)
+                api(libs.ktor.core)
+                api(libs.ktor.logging)
             }
         }
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))
-                implementation(Dependencies.Test.MOCKK_COMMON)
-                implementation(Dependencies.Test.KTOR)
-                implementation(Dependencies.Test.KOIN)
+                implementation(libs.mockk.common)
+                implementation(libs.ktor.client.mock)
+                implementation(libs.koin.test)
             }
         }
         val androidMain by getting {
             dependencies {
-                implementation(Dependencies.Network.KTOR_OKHTTP)
+                implementation(libs.ktor.okhttp)
             }
         }
         val iosX64Main by getting
@@ -65,7 +65,7 @@ kotlin {
             iosArm64Main.dependsOn(this)
             iosSimulatorArm64Main.dependsOn(this)
             dependencies {
-                implementation(Dependencies.Network.KTOR_IOS)
+                implementation(libs.ktor.ios)
             }
         }
         val macosArm64Main by getting
@@ -75,31 +75,31 @@ kotlin {
             macosArm64Main.dependsOn(this)
             macosX64Main.dependsOn(this)
             dependencies {
-                implementation(Dependencies.Network.KTOR_DARWIN)
+                implementation(libs.ktor.darwin)
             }
         }
         val iosTest by creating {
             dependsOn(commonTest)
         }
         val jvmMain by getting {
             dependencies {
-                implementation(Dependencies.Network.KTOR_OKHTTP)
+                implementation(libs.ktor.okhttp)
             }
         }
         val jvmTest by getting {
             dependencies {
-                implementation(Dependencies.Test.MOCKK_JVM)
+                implementation(libs.mockk.jvm)
             }
         }
     }
 }
 
 android {
     namespace = "co.yml.ychat.core"
-    compileSdk = Config.COMPILE_SDK_VERSION
+    compileSdk = libs.versions.config.compile.sdk.version.get().toInt()
     defaultConfig {
-        minSdk = Config.MIN_SDK_VERSION
-        targetSdk = Config.TARGET_SDK_VERSION
+        minSdk = libs.versions.config.min.sdk.version.get().toInt()
+        targetSdk = libs.versions.config.target.sdk.version.get().toInt()
     }
 }
 
diff --git a/ychat/build.gradle.kts b/ychat/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     kotlin("multiplatform")
-    kotlin("plugin.serialization").version(Versions.KOTLIN)
-    id("io.github.luca992.multiplatform-swiftpackage").version(Versions.SPM_PLUGIN)
+    kotlin("plugin.serialization").version(libs.versions.kotlin)
+    id("io.github.luca992.multiplatform-swiftpackage").version(libs.versions.spmPlugin)
     id("com.vanniktech.maven.publish")
     id("com.android.library")
     id("io.gitlab.arturbosch.detekt")
@@ -53,22 +53,22 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation(Dependencies.DI.KOIN_CORE)
+                implementation(libs.koin.core)
                 implementation(project(":ychat-core"))
             }
         }
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))
-                implementation(Dependencies.Test.MOCKK_COMMON)
-                implementation(Dependencies.Test.KTOR)
-                implementation(Dependencies.Test.KOIN)
+                implementation(libs.mockk.common)
+                implementation(libs.ktor.client.mock)
+                implementation(libs.koin.test)
             }
         }
         val androidMain by getting
         val androidTest by getting {
             dependencies {
-                implementation(Dependencies.Test.MOCKK)
+                implementation(libs.mockk)
             }
         }
         val iosX64Main by getting
@@ -99,18 +99,18 @@ kotlin {
         val jvmMain by getting
         val jvmTest by getting {
             dependencies {
-                implementation(Dependencies.Test.MOCKK_JVM)
+                implementation(libs.mockk.jvm)
             }
         }
     }
 }
 
 android {
     namespace = "co.yml.ychat"
-    compileSdk = Config.COMPILE_SDK_VERSION
+    compileSdk = libs.versions.config.compile.sdk.version.get().toInt()
     defaultConfig {
-        minSdk = Config.MIN_SDK_VERSION
-        targetSdk = Config.TARGET_SDK_VERSION
+        minSdk = libs.versions.config.min.sdk.version.get().toInt()
+        targetSdk = libs.versions.config.target.sdk.version.get().toInt()
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id("org.springframework.boot").version(Versions.SPRING)`
	`2`	`+ id("org.springframework.boot").version(libs.versions.spring)`
`3`	`3`	`java`
`4`	`4`	`}`
`5`	`5`
`@@ -10,6 +10,6 @@ java {`
`10`	`10`
`11`	`11`	`dependencies {`
`12`	`12`	`implementation(project(":ychat"))`
`13`		`- implementation(platform(Dependencies.Spring.SPRING_DEP))`
`14`		`- implementation(Dependencies.Spring.SPRING_WEB)`
	`13`	`+ implementation(platform(libs.spring.boot.dependencies))`
	`14`	`+ implementation(libs.spring.boot.web)`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,23 +37,23 @@ kotlin {`
`37`	`37`	`sourceSets {`
`38`	`38`	`val commonMain by getting {`
`39`	`39`	`dependencies {`
`40`		`- api(Dependencies.Network.KTOR_NEGOTIATION)`
`41`		`- api(Dependencies.Network.KTOR_SERIALIZATION)`
`42`		`- api(Dependencies.Network.KTOR_CORE)`
`43`		`- api(Dependencies.Network.KTOR_LOGGING)`
	`40`	`+ api(libs.ktor.negotiation)`
	`41`	`+ api(libs.ktor.serialization)`
	`42`	`+ api(libs.ktor.core)`
	`43`	`+ api(libs.ktor.logging)`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`val commonTest by getting {`
`47`	`47`	`dependencies {`
`48`	`48`	`implementation(kotlin("test"))`
`49`		`- implementation(Dependencies.Test.MOCKK_COMMON)`
`50`		`- implementation(Dependencies.Test.KTOR)`
`51`		`- implementation(Dependencies.Test.KOIN)`
	`49`	`+ implementation(libs.mockk.common)`
	`50`	`+ implementation(libs.ktor.client.mock)`
	`51`	`+ implementation(libs.koin.test)`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`val androidMain by getting {`
`55`	`55`	`dependencies {`
`56`		`- implementation(Dependencies.Network.KTOR_OKHTTP)`
	`56`	`+ implementation(libs.ktor.okhttp)`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`val iosX64Main by getting`
`@@ -65,7 +65,7 @@ kotlin {`
`65`	`65`	`iosArm64Main.dependsOn(this)`
`66`	`66`	`iosSimulatorArm64Main.dependsOn(this)`
`67`	`67`	`dependencies {`
`68`		`- implementation(Dependencies.Network.KTOR_IOS)`
	`68`	`+ implementation(libs.ktor.ios)`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`val macosArm64Main by getting`
`@@ -75,31 +75,31 @@ kotlin {`
`75`	`75`	`macosArm64Main.dependsOn(this)`
`76`	`76`	`macosX64Main.dependsOn(this)`
`77`	`77`	`dependencies {`
`78`		`- implementation(Dependencies.Network.KTOR_DARWIN)`
	`78`	`+ implementation(libs.ktor.darwin)`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`val iosTest by creating {`
`82`	`82`	`dependsOn(commonTest)`
`83`	`83`	`}`
`84`	`84`	`val jvmMain by getting {`
`85`	`85`	`dependencies {`
`86`		`- implementation(Dependencies.Network.KTOR_OKHTTP)`
	`86`	`+ implementation(libs.ktor.okhttp)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`val jvmTest by getting {`
`90`	`90`	`dependencies {`
`91`		`- implementation(Dependencies.Test.MOCKK_JVM)`
	`91`	`+ implementation(libs.mockk.jvm)`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`android {`
`98`	`98`	`namespace = "co.yml.ychat.core"`
`99`		`- compileSdk = Config.COMPILE_SDK_VERSION`
	`99`	`+ compileSdk = libs.versions.config.compile.sdk.version.get().toInt()`
`100`	`100`	`defaultConfig {`
`101`		`- minSdk = Config.MIN_SDK_VERSION`
`102`		`- targetSdk = Config.TARGET_SDK_VERSION`
	`101`	`+ minSdk = libs.versions.config.min.sdk.version.get().toInt()`
	`102`	`+ targetSdk = libs.versions.config.target.sdk.version.get().toInt()`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`kotlin("multiplatform")`
`3`		`- kotlin("plugin.serialization").version(Versions.KOTLIN)`
`4`		`- id("io.github.luca992.multiplatform-swiftpackage").version(Versions.SPM_PLUGIN)`
	`3`	`+ kotlin("plugin.serialization").version(libs.versions.kotlin)`
	`4`	`+ id("io.github.luca992.multiplatform-swiftpackage").version(libs.versions.spmPlugin)`
`5`	`5`	`id("com.vanniktech.maven.publish")`
`6`	`6`	`id("com.android.library")`
`7`	`7`	`id("io.gitlab.arturbosch.detekt")`
`@@ -53,22 +53,22 @@ kotlin {`
`53`	`53`	`sourceSets {`
`54`	`54`	`val commonMain by getting {`
`55`	`55`	`dependencies {`
`56`		`- implementation(Dependencies.DI.KOIN_CORE)`
	`56`	`+ implementation(libs.koin.core)`
`57`	`57`	`implementation(project(":ychat-core"))`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`val commonTest by getting {`
`61`	`61`	`dependencies {`
`62`	`62`	`implementation(kotlin("test"))`
`63`		`- implementation(Dependencies.Test.MOCKK_COMMON)`
`64`		`- implementation(Dependencies.Test.KTOR)`
`65`		`- implementation(Dependencies.Test.KOIN)`
	`63`	`+ implementation(libs.mockk.common)`
	`64`	`+ implementation(libs.ktor.client.mock)`
	`65`	`+ implementation(libs.koin.test)`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`val androidMain by getting`
`69`	`69`	`val androidTest by getting {`
`70`	`70`	`dependencies {`
`71`		`- implementation(Dependencies.Test.MOCKK)`
	`71`	`+ implementation(libs.mockk)`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`val iosX64Main by getting`
`@@ -99,18 +99,18 @@ kotlin {`
`99`	`99`	`val jvmMain by getting`
`100`	`100`	`val jvmTest by getting {`
`101`	`101`	`dependencies {`
`102`		`- implementation(Dependencies.Test.MOCKK_JVM)`
	`102`	`+ implementation(libs.mockk.jvm)`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`android {`
`109`	`109`	`namespace = "co.yml.ychat"`
`110`		`- compileSdk = Config.COMPILE_SDK_VERSION`
	`110`	`+ compileSdk = libs.versions.config.compile.sdk.version.get().toInt()`
`111`	`111`	`defaultConfig {`
`112`		`- minSdk = Config.MIN_SDK_VERSION`
`113`		`- targetSdk = Config.TARGET_SDK_VERSION`
	`112`	`+ minSdk = libs.versions.config.min.sdk.version.get().toInt()`
	`113`	`+ targetSdk = libs.versions.config.target.sdk.version.get().toInt()`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`