Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
```

Expand All @@ -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")
}
```

Expand Down
11 changes: 7 additions & 4 deletions benchmarks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
}
}

Expand All @@ -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")
}
}
}
Expand Down
14 changes: 10 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions examples/multiplatform-chat/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions playground/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ plugins {
kotlin("multiplatform")
}

val ktorVersion: String by rootProject

kotlin {
jvm()
js(IR) {
Expand All @@ -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
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions rsocket-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
}
Expand Down
8 changes: 8 additions & 0 deletions rsocket-test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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 {
Expand Down
18 changes: 10 additions & 8 deletions rsocket-transport-ktor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
}
Expand All @@ -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"))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ plugins {
id("com.jfrog.artifactory")
}

val ktorVersion: String by rootProject

kotlin {
jvm()
js()
Expand All @@ -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")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ plugins {
id("com.jfrog.artifactory")
}

val ktorVersion: String by rootProject

kotlin {
jvm()

Expand All @@ -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")
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand Down