Putting more libraries into version catalog (#981)

kittinunf · Jan 8, 2025 · f9c0bd4 · f9c0bd4
1 parent e3687e1
commit f9c0bd4
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 16 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    kotlin("multiplatform") version "2.1.0" apply false
-    id("org.jetbrains.kotlinx.kover") version "0.9.0" apply false
+    alias(libs.plugins.multiplatform) apply false
+    alias(libs.plugins.kover) apply false
 }
 
 val isReleaseBuild: Boolean

diff --git a/fuel-forge-jvm/build.gradle.kts b/fuel-forge-jvm/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     kotlin("jvm")
     id("publication")
-    id("org.jetbrains.kotlinx.kover")
+    alias(libs.plugins.kover)
 }
 
 kotlin {

diff --git a/fuel-jackson-jvm/build.gradle.kts b/fuel-jackson-jvm/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     kotlin("jvm")
     id("publication")
-    id("org.jetbrains.kotlinx.kover")
+    alias(libs.plugins.kover)
 }
 
 kotlin {

diff --git a/fuel-kotlinx-serialization/build.gradle.kts b/fuel-kotlinx-serialization/build.gradle.kts
@@ -1,16 +1,14 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    kotlin("multiplatform")
-    kotlin("plugin.serialization") version "2.1.0"
+    alias(libs.plugins.multiplatform)
+    alias(libs.plugins.serialization)
     id("publication")
-    id("org.jetbrains.kotlinx.kover")
+    alias(libs.plugins.kover)
 }
 
 kotlin {
     jvm {
-        @OptIn(ExperimentalKotlinGradlePluginApi::class)
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_1_8)
         }

diff --git a/fuel-moshi-jvm/build.gradle.kts b/fuel-moshi-jvm/build.gradle.kts
@@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     kotlin("jvm")
     id("publication")
-    id("org.jetbrains.kotlinx.kover")
-    id("com.google.devtools.ksp") version "2.1.0-1.0.29"
+    alias(libs.plugins.kover)
+    alias(libs.plugins.ksp)
 }
 
 kotlin {

diff --git a/fuel/build.gradle.kts b/fuel/build.gradle.kts
@@ -1,15 +1,13 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    kotlin("multiplatform")
+    alias(libs.plugins.multiplatform)
     id("publication")
-    id("org.jetbrains.kotlinx.kover")
+    alias(libs.plugins.kover)
 }
 
 kotlin {
     jvm {
-        @OptIn(ExperimentalKotlinGradlePluginApi::class)
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_1_8)
         }
@@ -55,7 +53,6 @@ kotlin {
 
     explicitApi()
 
-    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     compilerOptions {
         freeCompilerArgs.add("-Xexpect-actual-classes")
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,6 +8,9 @@ forge = "1.0.0-alpha3"
 result = "5.6.0"
 serialization = "1.8.0"
 kotlinx-io = "0.6.0"
+kover = "0.9.0"
+kotlin = "2.1.0"
+ksp = "2.1.0-1.0.29"
 
 [libraries]
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
@@ -22,3 +25,9 @@ okhttp-coroutines = { group = "com.squareup.okhttp3", name = "okhttp-coroutines"
 forge = { group = "com.github.kittinunf.forge", name = "forge", version.ref = "forge" }
 result = { group = "com.github.kittinunf.result", name = "result", version.ref = "result"}
 result-jvm = { group = "com.github.kittinunf.result", name = "result-jvm", version.ref = "result"}
+
+[plugins]
+multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
+serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+ksp = {id = "com.google.devtools.ksp", version.ref="ksp" }