Version catalogs and safe project accessors (#197)

olme04 · web-flow · commit af8a5b81d9b1 · 2022-01-12T11:20:15.000+02:00
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
@@ -20,13 +20,11 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.*
 
 plugins {
     kotlin("multiplatform")
-    id("org.jetbrains.kotlinx.benchmark")
-    kotlin("plugin.allopen")
-}
+    id("kotlinx-atomicfu")
 
-val rsocketJavaVersion: String by rootProject
-val kotlinxCoroutinesVersion: String by rootProject
-val kotlinxBenchmarkVersion: String by rootProject
+    alias(libs.plugins.kotlin.allopen)
+    alias(libs.plugins.kotlinx.benchmark)
+}
 
 val jmhVersionOverride: String by rootProject
 
@@ -38,8 +36,8 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:$kotlinxBenchmarkVersion")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
+                implementation(libs.kotlinx.benchmark)
+                implementation(libs.kotlinx.coroutines.core)
             }
         }
 
@@ -48,17 +46,17 @@ kotlin {
         val kotlinMain by getting {
             dependsOn(jvmMain)
             dependencies {
-                implementation(project(":rsocket-core"))
-                implementation(project(":rsocket-transport-local"))
+                implementation(projects.rsocketCore)
+                implementation(projects.rsocketTransportLocal)
             }
         }
 
         val javaMain by getting {
             dependsOn(jvmMain)
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesVersion")
-                implementation("io.rsocket:rsocket-core:$rsocketJavaVersion")
-                implementation("io.rsocket:rsocket-transport-local:$rsocketJavaVersion")
+                implementation(libs.kotlinx.coroutines.reactor)
+                implementation(libs.rsocket.java.core)
+                implementation(libs.rsocket.java.transport.local)
             }
         }
     }
@@ -75,7 +73,7 @@ benchmark {
         register("java")
     }
 
-    targets.withType<JvmBenchmarkTarget> { jmhVersion = jmhVersionOverride }
+    targets.withType<JvmBenchmarkTarget> { jmhVersion = libs.versions.jmh.get() }
 }
 
 tasks.register<JavaExec>("jmhProfilers") {
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,22 +24,16 @@ buildscript {
     repositories {
         mavenCentral()
     }
-    val kotlinVersion: String by rootProject
-    val kotlinxAtomicfuVersion: String by rootProject
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-        classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:$kotlinxAtomicfuVersion")
+        classpath(libs.build.kotlin)
+        classpath(libs.build.kotlinx.atomicfu)
     }
 }
 
-val kotlinxAtomicfuVersion: String by rootProject
-
 plugins {
-    id("com.github.ben-manes.versions")
-
-    //needed to add classpath to script
-    id("com.jfrog.artifactory") apply false
+    alias(libs.plugins.versionUpdates)
+    alias(libs.plugins.jfrog.artifactory) apply false //needed to add classpath to script
 }
 
 //on macos it will return all publications supported by rsocket, as linux and mingw can be crosscompiled there for publication
@@ -146,8 +140,6 @@ subprojects {
         extensions.configure<KotlinMultiplatformExtension> {
             val isTestProject = project.name == "rsocket-test" || project.name == "rsocket-test-server"
             val isLibProject = project.name.startsWith("rsocket")
-            val isPlaygroundProject = project.name == "playground"
-            val isExampleProject = "examples" in project.path
 
             sourceSets.all {
                 languageSettings.apply {
@@ -159,7 +151,7 @@ subprojects {
                     // will be not needed in future with ktor 2.0.0
                     optIn("io.ktor.utils.io.core.ExperimentalIoApi")
 
-                    if (name.contains("test", ignoreCase = true) || isTestProject || isPlaygroundProject) {
+                    if (name.contains("test", ignoreCase = true) || isTestProject) {
                         optIn("kotlin.time.ExperimentalTime")
                         optIn("kotlin.ExperimentalStdlibApi")
 
@@ -183,14 +175,7 @@ subprojects {
             if (isLibProject && !isTestProject) {
                 explicitApi()
                 sourceSets["commonTest"].dependencies {
-                    implementation(project(":rsocket-test"))
-                }
-            }
-
-            //fix atomicfu for examples and playground
-            if (isExampleProject || isPlaygroundProject) {
-                sourceSets["commonMain"].dependencies {
-                    implementation("org.jetbrains.kotlinx:atomicfu:$kotlinxAtomicfuVersion")
+                    implementation(projects.rsocketTest)
                 }
             }
         }
diff --git a/gradle.properties b/gradle.properties
@@ -16,19 +16,6 @@
 #Project
 group=io.rsocket.kotlin
 version=0.15.0-SNAPSHOT
-#Versions
-kotlinVersion=1.6.10
-ktorVersion=1.6.7
-kotlinxCoroutinesVersion=1.5.2-native-mt
-kotlinxAtomicfuVersion=0.17.0
-kotlinxSerializationVersion=1.3.1
-kotlinxBenchmarkVersion=0.4.0
-rsocketJavaVersion=1.1.1
-turbineVersion=0.7.0
-artifactoryVersion=4.25.1
-versionUpdatesVersion=0.39.0
-gradleEnterpriseVersion=3.4.1
-jmhVersionOverride=1.33
 #Kotlin
 kotlin.js.compiler=both
 kotlin.mpp.stability.nowarn=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,53 @@
+[versions]
+kotlin = "1.6.10"
+
+kotlinx-atomicfu = "0.17.0"
+kotlinx-coroutines = "1.5.2-native-mt"
+kotlinx-benchmark = "0.4.0"
+
+ktor = "1.6.7"
+
+turbine = "0.7.0"
+
+jfrog-artifactory = "4.25.1"
+versionUpdates = "0.39.0"
+
+rsocket-java = "1.1.1"
+
+jmh = "1.33"
+
+[libraries]
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor", version.ref = "kotlinx-coroutines" }
+
+kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "kotlinx-atomicfu" }
+kotlinx-benchmark = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlinx-benchmark" }
+
+ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" }
+ktor-utils = { module = "io.ktor:ktor-utils", version.ref = "ktor" }
+ktor-network = { module = "io.ktor:ktor-network", version.ref = "ktor" }
+ktor-http-cio = { module = "io.ktor:ktor-http-cio", version.ref = "ktor" }
+ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
+ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
+ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
+ktor-server-core = { module = "io.ktor:ktor-server", version.ref = "ktor" }
+ktor-server-websockets = { module = "io.ktor:ktor-websockets", version.ref = "ktor" }
+ktor-server-cio = { module = "io.ktor:ktor-server-cio", version.ref = "ktor" }
+ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" }
+ktor-server-jetty = { module = "io.ktor:ktor-server-jetty", version.ref = "ktor" }
+
+turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
+
+rsocket-java-core = { module = 'io.rsocket:rsocket-core', version.ref = "rsocket-java" }
+rsocket-java-transport-local = { module = 'io.rsocket:rsocket-transport-local', version.ref = "rsocket-java" }
+
+build-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+build-kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "kotlinx-atomicfu" }
+
+[plugins]
+kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
+
+kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlinx-benchmark" }
+
+versionUpdates = { id = "com.github.ben-manes.versions", version.ref = "versionUpdates" }
+jfrog-artifactory = { id = "com.jfrog.artifactory", version.ref = "jfrog-artifactory" }
diff --git a/rsocket-core/build.gradle.kts b/rsocket-core/build.gradle.kts
@@ -23,20 +23,17 @@ plugins {
     id("com.jfrog.artifactory")
 }
 
-val ktorVersion: String by rootProject
-val kotlinxCoroutinesVersion: String by rootProject
-
 kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api("io.ktor:ktor-io:$ktorVersion")
-                api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
+                api(libs.kotlinx.coroutines.core)
+                api(libs.ktor.io)
             }
         }
         val commonTest by getting {
             dependencies {
-                implementation(project(":rsocket-transport-local"))
+                implementation(projects.rsocketTransportLocal)
             }
         }
     }
diff --git a/rsocket-test/build.gradle.kts b/rsocket-test/build.gradle.kts
@@ -19,20 +19,15 @@ plugins {
     id("kotlinx-atomicfu")
 }
 
-val ktorVersion: String by rootProject
-val kotlinxCoroutinesVersion: String by rootProject
-val turbineVersion: String by rootProject
-
 kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
                 api(kotlin("test"))
-                api(project(":rsocket-core"))
+                api(projects.rsocketCore)
 
-                api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
-                api("io.ktor:ktor-utils:$ktorVersion")
-                api("app.cash.turbine:turbine:$turbineVersion")
+                api(libs.ktor.utils)
+                api(libs.turbine)
             }
         }
         val jvmMain by getting {
diff --git a/rsocket-test/rsocket-test-server/build.gradle.kts b/rsocket-test/rsocket-test-server/build.gradle.kts
@@ -20,18 +20,17 @@ import java.net.*
 
 plugins {
     kotlin("multiplatform")
+    id("kotlinx-atomicfu")
 }
 
-val ktorVersion: String by rootProject
-
 kotlin {
     sourceSets {
         val jvmMain by getting {
             dependencies {
-                implementation(project(":rsocket-test"))
-                implementation(project(":rsocket-transport-ktor-server"))
+                implementation(projects.rsocketTest)
+                implementation(projects.rsocketTransportKtorServer)
 
-                implementation("io.ktor:ktor-server-cio:$ktorVersion")
+                implementation(libs.ktor.server.cio)
             }
         }
     }
diff --git a/rsocket-transport-ktor/build.gradle.kts b/rsocket-transport-ktor/build.gradle.kts
@@ -16,42 +16,38 @@
 
 plugins {
     kotlin("multiplatform")
+    id("kotlinx-atomicfu")
 
     signing
     `maven-publish`
     id("com.jfrog.artifactory")
 }
 
-val ktorVersion: String by rootProject
-val kotlinxAtomicfuVersion: String by rootProject
-
 kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(project(":rsocket-core"))
+                api(projects.rsocketCore)
 
-                api("io.ktor:ktor-network:$ktorVersion")
-                api("io.ktor:ktor-http-cio:$ktorVersion")
+                api(libs.ktor.network)
+                api(libs.ktor.http.cio)
             }
         }
         val commonTest by getting {
             dependencies {
-                implementation(project(":rsocket-transport-ktor-client"))
-
-                implementation("org.jetbrains.kotlinx:atomicfu:$kotlinxAtomicfuVersion")
+                implementation(projects.rsocketTransportKtorClient)
             }
         }
         val jvmTest by getting {
             dependencies {
-                implementation(project(":rsocket-transport-ktor-server"))
+                implementation(projects.rsocketTransportKtorServer)
 
-                implementation("io.ktor:ktor-client-cio:$ktorVersion")
-                implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
+                implementation(libs.ktor.client.cio)
+                implementation(libs.ktor.client.okhttp)
 
-                implementation("io.ktor:ktor-server-cio:$ktorVersion")
-                implementation("io.ktor:ktor-server-netty:$ktorVersion")
-                implementation("io.ktor:ktor-server-jetty:$ktorVersion")
+                implementation(libs.ktor.server.cio)
+                implementation(libs.ktor.server.netty)
+                implementation(libs.ktor.server.jetty)
             }
         }
     }
diff --git a/rsocket-transport-ktor/rsocket-transport-ktor-client/build.gradle.kts b/rsocket-transport-ktor/rsocket-transport-ktor-client/build.gradle.kts
@@ -16,22 +16,21 @@
 
 plugins {
     kotlin("multiplatform")
+    id("kotlinx-atomicfu")
 
     signing
     `maven-publish`
     id("com.jfrog.artifactory")
 }
 
-val ktorVersion: String by rootProject
-
 kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(project(":rsocket-core"))
-                api(project(":rsocket-transport-ktor"))
+                api(projects.rsocketCore)
+                api(projects.rsocketTransportKtor)
 
-                api("io.ktor:ktor-client-core:$ktorVersion")
+                api(libs.ktor.client.core)
             }
         }
     }
diff --git a/rsocket-transport-ktor/rsocket-transport-ktor-server/build.gradle.kts b/rsocket-transport-ktor/rsocket-transport-ktor-server/build.gradle.kts
@@ -16,23 +16,22 @@
 
 plugins {
     kotlin("multiplatform")
+    id("kotlinx-atomicfu")
 
     signing
     `maven-publish`
     id("com.jfrog.artifactory")
 }
 
-val ktorVersion: String by rootProject
-
 kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(project(":rsocket-core"))
-                api(project(":rsocket-transport-ktor"))
+                api(projects.rsocketCore)
+                api(projects.rsocketTransportKtor)
 
-                api("io.ktor:ktor-server:$ktorVersion")
-                api("io.ktor:ktor-websockets:$ktorVersion")
+                api(libs.ktor.server.core)
+                api(libs.ktor.server.websockets)
             }
         }
     }
diff --git a/rsocket-transport-local/build.gradle.kts b/rsocket-transport-local/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     kotlin("multiplatform")
+    id("kotlinx-atomicfu")
 
     signing
     `maven-publish`
@@ -26,7 +27,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(project(":rsocket-core"))
+                api(projects.rsocketCore)
             }
         }
     }
diff --git a/rsocket-transport-nodejs-tcp/build.gradle.kts b/rsocket-transport-nodejs-tcp/build.gradle.kts
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -23,20 +23,17 @@ plugins {`
`23`	`23`	`id("com.jfrog.artifactory")`
`24`	`24`	`}`
`25`	`25`
`26`		`-val ktorVersion: String by rootProject`
`27`		`-val kotlinxCoroutinesVersion: String by rootProject`
`28`		`-`
`29`	`26`	`kotlin {`
`30`	`27`	`sourceSets {`
`31`	`28`	`val commonMain by getting {`
`32`	`29`	`dependencies {`
`33`		`- api("io.ktor:ktor-io:$ktorVersion")`
`34`		`- api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")`
	`30`	`+ api(libs.kotlinx.coroutines.core)`
	`31`	`+ api(libs.ktor.io)`
`35`	`32`	`}`
`36`	`33`	`}`
`37`	`34`	`val commonTest by getting {`
`38`	`35`	`dependencies {`
`39`		`- implementation(project(":rsocket-transport-local"))`
	`36`	`+ implementation(projects.rsocketTransportLocal)`
`40`	`37`	`}`
`41`	`38`	`}`
`42`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,18 +20,17 @@ import java.net.*`
`20`	`20`
`21`	`21`	`plugins {`
`22`	`22`	`kotlin("multiplatform")`
	`23`	`+ id("kotlinx-atomicfu")`
`23`	`24`	`}`
`24`	`25`
`25`		`-val ktorVersion: String by rootProject`
`26`		`-`
`27`	`26`	`kotlin {`
`28`	`27`	`sourceSets {`
`29`	`28`	`val jvmMain by getting {`
`30`	`29`	`dependencies {`
`31`		`- implementation(project(":rsocket-test"))`
`32`		`- implementation(project(":rsocket-transport-ktor-server"))`
	`30`	`+ implementation(projects.rsocketTest)`
	`31`	`+ implementation(projects.rsocketTransportKtorServer)`
`33`	`32`
`34`		`- implementation("io.ktor:ktor-server-cio:$ktorVersion")`
	`33`	`+ implementation(libs.ktor.server.cio)`
`35`	`34`	`}`
`36`	`35`	`}`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,22 +16,21 @@`
`16`	`16`
`17`	`17`	`plugins {`
`18`	`18`	`kotlin("multiplatform")`
	`19`	`+ id("kotlinx-atomicfu")`
`19`	`20`
`20`	`21`	`signing`
`21`	`22`	`maven-publish`
`22`	`23`	`id("com.jfrog.artifactory")`
`23`	`24`	`}`
`24`	`25`
`25`		`-val ktorVersion: String by rootProject`
`26`		`-`
`27`	`26`	`kotlin {`
`28`	`27`	`sourceSets {`
`29`	`28`	`val commonMain by getting {`
`30`	`29`	`dependencies {`
`31`		`- api(project(":rsocket-core"))`
`32`		`- api(project(":rsocket-transport-ktor"))`
	`30`	`+ api(projects.rsocketCore)`
	`31`	`+ api(projects.rsocketTransportKtor)`
`33`	`32`
`34`		`- api("io.ktor:ktor-client-core:$ktorVersion")`
	`33`	`+ api(libs.ktor.client.core)`
`35`	`34`	`}`
`36`	`35`	`}`
`37`	`36`	`}`