Update ktor version (#103)

whyoleg · web-flow · commit b23ac26ffc7c · 2020-10-03T22:17:19.000+03:00
extract versions to gradle.properties
diff --git a/README.md b/README.md
@@ -63,15 +63,15 @@ dependencies {
 
 //  one of ktor engines to work with websockets
 //  client engines
-//    implementation 'io.ktor:ktor-client-js:1.4.0' //js
-//    implementation 'io.ktor:ktor-client-cio:1.4.0' //jvm
-//    implementation 'io.ktor:ktor-client-okhttp:1.4.0' //jvm
+//    implementation 'io.ktor:ktor-client-js:1.4.1' //js
+//    implementation 'io.ktor:ktor-client-cio:1.4.1' //jvm
+//    implementation 'io.ktor:ktor-client-okhttp:1.4.1' //jvm
 
 //  server engines (jvm only)
-//    implementation 'io.ktor:ktor-server-cio:1.4.0'
-//    implementation 'io.ktor:ktor-server-netty:1.4.0'
-//    implementation 'io.ktor:ktor-server-jetty:1.4.0'
-//    implementation 'io.ktor:ktor-server-tomcat:1.4.0'
+//    implementation 'io.ktor:ktor-server-cio:1.4.1'
+//    implementation 'io.ktor:ktor-server-netty:1.4.1'
+//    implementation 'io.ktor:ktor-server-jetty:1.4.1'
+//    implementation 'io.ktor:ktor-server-tomcat:1.4.1'
 }
 ```
 
@@ -93,15 +93,15 @@ dependencies {
 
 //  one of ktor engines to work with websockets
 //  client engines
-//    implementation("io.ktor:ktor-client-js:1.4.0") //js
-//    implementation("io.ktor:ktor-client-cio:1.4.0") //jvm
-//    implementation("io.ktor:ktor-client-okhttp:1.4.0") //jvm
+//    implementation("io.ktor:ktor-client-js:1.4.1") //js
+//    implementation("io.ktor:ktor-client-cio:1.4.1") //jvm
+//    implementation("io.ktor:ktor-client-okhttp:1.4.1") //jvm
 
 //  server engines (jvm only)
-//    implementation("io.ktor:ktor-server-cio:1.4.0")
-//    implementation("io.ktor:ktor-server-netty:1.4.0")
-//    implementation("io.ktor:ktor-server-jetty:1.4.0")
-//    implementation("io.ktor:ktor-server-tomcat:1.4.0")
+//    implementation("io.ktor:ktor-server-cio:1.4.1")
+//    implementation("io.ktor:ktor-server-netty:1.4.1")
+//    implementation("io.ktor:ktor-server-jetty:1.4.1")
+//    implementation("io.ktor:ktor-server-tomcat:1.4.1")
 }
 ```
 
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
@@ -26,6 +26,9 @@ repositories {
     maven("https://repo.spring.io/libs-snapshot")
 }
 
+val rsocketJavaVersion: String by rootProject
+val kotlinxCoroutinesVersion: String by rootProject
+
 kotlin {
     val jvm = jvm() //common jvm source set
     val kotlinJvm = jvm("kotlin")  //kotlin benchmark
@@ -35,7 +38,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation("org.jetbrains.kotlinx:kotlinx.benchmark.runtime:0.2.0-dev-20")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
             }
         }
 
@@ -52,9 +55,9 @@ kotlin {
         val javaMain by getting {
             dependsOn(jvmMain)
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.3.9")
-                implementation("io.rsocket:rsocket-core:1.1.0-M1")
-                implementation("io.rsocket:rsocket-transport-local:1.1.0-M1")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesVersion")
+                implementation("io.rsocket:rsocket-core:$rsocketJavaVersion")
+                implementation("io.rsocket:rsocket-transport-local:$rsocketJavaVersion")
             }
         }
     }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -26,14 +26,20 @@ buildscript {
     repositories {
         mavenCentral()
     }
+    val kotlinVersion: String by rootProject
+    val kotlinxAtomicfuVersion: String by rootProject
+
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10")
-        classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.14.4")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+        classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:$kotlinxAtomicfuVersion")
     }
 }
 
+val kotlinxAtomicfuVersion: String by rootProject
+
 plugins {
-    id("com.github.ben-manes.versions") version "0.29.0"
+    id("com.github.ben-manes.versions")
 
     //needed to add classpath to script
     id("com.jfrog.bintray") apply false
@@ -118,7 +124,7 @@ subprojects {
             if ("examples" in project.path || project.name == "playground") {
                 val commonMain by sourceSets.getting {
                     dependencies {
-                        implementation("org.jetbrains.kotlinx:atomicfu:0.14.4")
+                        implementation("org.jetbrains.kotlinx:atomicfu:$kotlinxAtomicfuVersion")
                     }
                 }
             }
diff --git a/examples/multiplatform-chat/build.gradle.kts b/examples/multiplatform-chat/build.gradle.kts
@@ -48,21 +48,21 @@ kotlin {
         val serverJvmMain by getting {
             dependencies {
                 implementation(project(":rsocket-transport-ktor-server"))
-                implementation("io.ktor:ktor-server-cio:1.4.0")
+                implementation("io.ktor:ktor-server-cio:1.4.1")
             }
         }
 
         val clientJvmMain by getting {
             dependsOn(clientMain)
             dependencies {
-                implementation("io.ktor:ktor-client-cio:1.4.0")
+                implementation("io.ktor:ktor-client-cio:1.4.1")
             }
         }
 
         val clientJsMain by getting {
             dependsOn(clientMain)
             dependencies {
-                implementation("io.ktor:ktor-client-js:1.4.0")
+                implementation("io.ktor:ktor-client-js:1.4.1")
             }
         }
     }
diff --git a/gradle.properties b/gradle.properties
@@ -18,6 +18,14 @@
 group=io.rsocket.kotlin
 version=0.10.0
 
+#Versions
+kotlinVersion=1.4.10
+ktorVersion=1.4.1
+kotlinxCoroutinesVersion=1.3.9
+kotlinxAtomicfuVersion=0.14.4
+turbineVersion=0.2.1
+rsocketJavaVersion=1.1.0-M2
+
 #Kotlin
 #kotlin.code.style=official
 kotlin.caching.enabled=true
diff --git a/playground/build.gradle.kts b/playground/build.gradle.kts
@@ -18,6 +18,8 @@ plugins {
     kotlin("multiplatform")
 }
 
+val ktorVersion: String by rootProject
+
 kotlin {
     jvm()
     js(IR) {
@@ -38,13 +40,13 @@ kotlin {
             dependencies {
                 implementation(project(":rsocket-transport-ktor-server"))
 
-                implementation("io.ktor:ktor-client-cio:1.4.0")
-                implementation("io.ktor:ktor-server-cio:1.4.0")
+                implementation("io.ktor:ktor-client-cio:$ktorVersion")
+                implementation("io.ktor:ktor-server-cio:$ktorVersion")
             }
         }
         val jsMain by getting {
             dependencies {
-                implementation("io.ktor:ktor-client-js:1.4.0") //for WS support
+                implementation("io.ktor:ktor-client-js:$ktorVersion") //for WS support
             }
         }
     }
diff --git a/rsocket-core/build.gradle.kts b/rsocket-core/build.gradle.kts
@@ -23,21 +23,22 @@ plugins {
     id("com.jfrog.artifactory")
 }
 
+val ktorVersion: String by rootProject
+val kotlinxCoroutinesVersion: String by rootProject
+
 kotlin {
     jvm()
     js()
 
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api("io.ktor:ktor-io:1.4.0")
-                api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
+                api("io.ktor:ktor-io:$ktorVersion")
+                api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
             }
         }
         val commonTest by getting {
             dependencies {
-                implementation("app.cash.turbine:turbine:0.2.1")
-                implementation("io.ktor:ktor-utils:1.4.0")
                 implementation(project(":rsocket-transport-local"))
             }
         }
diff --git a/rsocket-test/build.gradle.kts b/rsocket-test/build.gradle.kts
@@ -18,6 +18,10 @@ plugins {
     kotlin("multiplatform")
 }
 
+val ktorVersion: String by rootProject
+val kotlinxCoroutinesVersion: String by rootProject
+val turbineVersion: String by rootProject
+
 kotlin {
     jvm()
     js()
@@ -28,6 +32,10 @@ kotlin {
                 api(project(":rsocket-core"))
                 api(kotlin("test-common"))
                 api(kotlin("test-annotations-common"))
+
+                api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
+                api("io.ktor:ktor-utils:$ktorVersion")
+                api("app.cash.turbine:turbine:$turbineVersion")
             }
         }
         val jvmMain by getting {
diff --git a/rsocket-transport-ktor/build.gradle.kts b/rsocket-transport-ktor/build.gradle.kts
@@ -22,15 +22,17 @@ plugins {
     id("com.jfrog.artifactory")
 }
 
+val ktorVersion: String by rootProject
+
 kotlin {
     jvm()
     js()
 
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api("io.ktor:ktor-network:1.4.0")
-                api("io.ktor:ktor-http-cio:1.4.0")
+                api("io.ktor:ktor-network:$ktorVersion")
+                api("io.ktor:ktor-http-cio:$ktorVersion")
                 api(project(":rsocket-core"))
             }
         }
@@ -41,13 +43,13 @@ kotlin {
         }
         val jvmTest by getting {
             dependencies {
-                implementation("io.ktor:ktor-client-cio:1.4.0")
-                implementation("io.ktor:ktor-client-okhttp:1.4.0")
+                implementation("io.ktor:ktor-client-cio:$ktorVersion")
+                implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
 
-                implementation("io.ktor:ktor-server-cio:1.4.0")
-                implementation("io.ktor:ktor-server-netty:1.4.0")
-                implementation("io.ktor:ktor-server-jetty:1.4.0")
-                implementation("io.ktor:ktor-server-tomcat:1.4.0")
+                implementation("io.ktor:ktor-server-cio:$ktorVersion")
+                implementation("io.ktor:ktor-server-netty:$ktorVersion")
+                implementation("io.ktor:ktor-server-jetty:$ktorVersion")
+                implementation("io.ktor:ktor-server-tomcat:$ktorVersion")
 
                 implementation(project(":rsocket-transport-ktor-server"))
             }
diff --git a/rsocket-transport-ktor/rsocket-transport-ktor-client/build.gradle.kts b/rsocket-transport-ktor/rsocket-transport-ktor-client/build.gradle.kts
@@ -22,6 +22,8 @@ plugins {
     id("com.jfrog.artifactory")
 }
 
+val ktorVersion: String by rootProject
+
 kotlin {
     jvm()
     js()
@@ -32,7 +34,7 @@ kotlin {
                 api(project(":rsocket-core"))
                 api(project(":rsocket-transport-ktor"))
 
-                api("io.ktor:ktor-client-core:1.4.0")
+                api("io.ktor:ktor-client-core:$ktorVersion")
             }
         }
     }
diff --git a/rsocket-transport-ktor/rsocket-transport-ktor-server/build.gradle.kts b/rsocket-transport-ktor/rsocket-transport-ktor-server/build.gradle.kts
@@ -22,6 +22,8 @@ plugins {
     id("com.jfrog.artifactory")
 }
 
+val ktorVersion: String by rootProject
+
 kotlin {
     jvm()
 
@@ -31,8 +33,8 @@ kotlin {
                 api(project(":rsocket-core"))
                 api(project(":rsocket-transport-ktor"))
 
-                api("io.ktor:ktor-server:1.4.0")
-                api("io.ktor:ktor-websockets:1.4.0")
+                api("io.ktor:ktor-server:$ktorVersion")
+                api("io.ktor:ktor-websockets:$ktorVersion")
             }
         }
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -23,7 +23,8 @@ pluginManagement {
 
     plugins {
         id("com.jfrog.bintray") version "1.8.5"
-        id("com.jfrog.artifactory") version "4.17.0"
+        id("com.jfrog.artifactory") version "4.17.2"
+        id("com.github.ben-manes.versions") version "0.33.0"
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ repositories {`
`26`	`26`	`maven("https://repo.spring.io/libs-snapshot")`
`27`	`27`	`}`
`28`	`28`
	`29`	`+val rsocketJavaVersion: String by rootProject`
	`30`	`+val kotlinxCoroutinesVersion: String by rootProject`
	`31`	`+`
`29`	`32`	`kotlin {`
`30`	`33`	`val jvm = jvm() //common jvm source set`
`31`	`34`	`val kotlinJvm = jvm("kotlin") //kotlin benchmark`
`@@ -35,7 +38,7 @@ kotlin {`
`35`	`38`	`val commonMain by getting {`
`36`	`39`	`dependencies {`
`37`	`40`	`implementation("org.jetbrains.kotlinx:kotlinx.benchmark.runtime:0.2.0-dev-20")`
`38`		`- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")`
	`41`	`+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")`
`39`	`42`	`}`
`40`	`43`	`}`
`41`	`44`
`@@ -52,9 +55,9 @@ kotlin {`
`52`	`55`	`val javaMain by getting {`
`53`	`56`	`dependsOn(jvmMain)`
`54`	`57`	`dependencies {`
`55`		`- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.3.9")`
`56`		`- implementation("io.rsocket:rsocket-core:1.1.0-M1")`
`57`		`- implementation("io.rsocket:rsocket-transport-local:1.1.0-M1")`
	`58`	`+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesVersion")`
	`59`	`+ implementation("io.rsocket:rsocket-core:$rsocketJavaVersion")`
	`60`	`+ implementation("io.rsocket:rsocket-transport-local:$rsocketJavaVersion")`
`58`	`61`	`}`
`59`	`62`	`}`
`60`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,20 @@ buildscript {`
`26`	`26`	`repositories {`
`27`	`27`	`mavenCentral()`
`28`	`28`	`}`
	`29`	`+ val kotlinVersion: String by rootProject`
	`30`	`+ val kotlinxAtomicfuVersion: String by rootProject`
	`31`	`+`
`29`	`32`	`dependencies {`
`30`		`- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10")`
`31`		`- classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.14.4")`
	`33`	`+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")`
	`34`	`+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")`
	`35`	`+ classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:$kotlinxAtomicfuVersion")`
`32`	`36`	`}`
`33`	`37`	`}`
`34`	`38`
	`39`	`+val kotlinxAtomicfuVersion: String by rootProject`
	`40`	`+`
`35`	`41`	`plugins {`
`36`		`- id("com.github.ben-manes.versions") version "0.29.0"`
	`42`	`+ id("com.github.ben-manes.versions")`
`37`	`43`
`38`	`44`	`//needed to add classpath to script`
`39`	`45`	`id("com.jfrog.bintray") apply false`
`@@ -118,7 +124,7 @@ subprojects {`
`118`	`124`	`if ("examples" in project.path \|\| project.name == "playground") {`
`119`	`125`	`val commonMain by sourceSets.getting {`
`120`	`126`	`dependencies {`
`121`		`- implementation("org.jetbrains.kotlinx:atomicfu:0.14.4")`
	`127`	`+ implementation("org.jetbrains.kotlinx:atomicfu:$kotlinxAtomicfuVersion")`
`122`	`128`	`}`
`123`	`129`	`}`
`124`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,21 +48,21 @@ kotlin {`
`48`	`48`	`val serverJvmMain by getting {`
`49`	`49`	`dependencies {`
`50`	`50`	`implementation(project(":rsocket-transport-ktor-server"))`
`51`		`- implementation("io.ktor:ktor-server-cio:1.4.0")`
	`51`	`+ implementation("io.ktor:ktor-server-cio:1.4.1")`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`val clientJvmMain by getting {`
`56`	`56`	`dependsOn(clientMain)`
`57`	`57`	`dependencies {`
`58`		`- implementation("io.ktor:ktor-client-cio:1.4.0")`
	`58`	`+ implementation("io.ktor:ktor-client-cio:1.4.1")`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`val clientJsMain by getting {`
`63`	`63`	`dependsOn(clientMain)`
`64`	`64`	`dependencies {`
`65`		`- implementation("io.ktor:ktor-client-js:1.4.0")`
	`65`	`+ implementation("io.ktor:ktor-client-js:1.4.1")`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ plugins {`
`18`	`18`	`kotlin("multiplatform")`
`19`	`19`	`}`
`20`	`20`
	`21`	`+val ktorVersion: String by rootProject`
	`22`	`+`
`21`	`23`	`kotlin {`
`22`	`24`	`jvm()`
`23`	`25`	`js(IR) {`
`@@ -38,13 +40,13 @@ kotlin {`
`38`	`40`	`dependencies {`
`39`	`41`	`implementation(project(":rsocket-transport-ktor-server"))`
`40`	`42`
`41`		`- implementation("io.ktor:ktor-client-cio:1.4.0")`
`42`		`- implementation("io.ktor:ktor-server-cio:1.4.0")`
	`43`	`+ implementation("io.ktor:ktor-client-cio:$ktorVersion")`
	`44`	`+ implementation("io.ktor:ktor-server-cio:$ktorVersion")`
`43`	`45`	`}`
`44`	`46`	`}`
`45`	`47`	`val jsMain by getting {`
`46`	`48`	`dependencies {`
`47`		`- implementation("io.ktor:ktor-client-js:1.4.0") //for WS support`
	`49`	`+ implementation("io.ktor:ktor-client-js:$ktorVersion") //for WS support`
`48`	`50`	`}`
`49`	`51`	`}`
`50`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,21 +23,22 @@ plugins {`
`23`	`23`	`id("com.jfrog.artifactory")`
`24`	`24`	`}`
`25`	`25`
	`26`	`+val ktorVersion: String by rootProject`
	`27`	`+val kotlinxCoroutinesVersion: String by rootProject`
	`28`	`+`
`26`	`29`	`kotlin {`
`27`	`30`	`jvm()`
`28`	`31`	`js()`
`29`	`32`
`30`	`33`	`sourceSets {`
`31`	`34`	`val commonMain by getting {`
`32`	`35`	`dependencies {`
`33`		`- api("io.ktor:ktor-io:1.4.0")`
`34`		`- api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")`
	`36`	`+ api("io.ktor:ktor-io:$ktorVersion")`
	`37`	`+ api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")`
`35`	`38`	`}`
`36`	`39`	`}`
`37`	`40`	`val commonTest by getting {`
`38`	`41`	`dependencies {`
`39`		`- implementation("app.cash.turbine:turbine:0.2.1")`
`40`		`- implementation("io.ktor:ktor-utils:1.4.0")`
`41`	`42`	`implementation(project(":rsocket-transport-local"))`
`42`	`43`	`}`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ plugins {`
`22`	`22`	`id("com.jfrog.artifactory")`
`23`	`23`	`}`
`24`	`24`
	`25`	`+val ktorVersion: String by rootProject`
	`26`	`+`
`25`	`27`	`kotlin {`
`26`	`28`	`jvm()`
`27`	`29`	`js()`
`@@ -32,7 +34,7 @@ kotlin {`
`32`	`34`	`api(project(":rsocket-core"))`
`33`	`35`	`api(project(":rsocket-transport-ktor"))`
`34`	`36`
`35`		`- api("io.ktor:ktor-client-core:1.4.0")`
	`37`	`+ api("io.ktor:ktor-client-core:$ktorVersion")`
`36`	`38`	`}`
`37`	`39`	`}`
`38`	`40`	`}`