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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Transports are implemented based on [ktor](https://github.com/ktorio/ktor) to en
So it depends on `ktor` engines for available transports and platforms (JVM, JS, Native):
* JVM - TCP and WebSocket for both client and server
* JS - WebSocket client only
* [SOON] Native - TCP for both client and server
* Native - TCP for both client and server (linux x64, macos, ios, watchos, tvos)

## Interactions

Expand Down
13 changes: 0 additions & 13 deletions TODO.md

This file was deleted.

3 changes: 1 addition & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ buildscript {
val kotlinxAtomicfuVersion: String by rootProject

dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:$kotlinxAtomicfuVersion")
}
Expand All @@ -48,9 +47,9 @@ plugins {

allprojects {
repositories {
mavenCentral()
jcenter()
maven("https://dl.bintray.com/kotlin/kotlinx")
mavenCentral()
}
}

Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ org.gradle.parallel=false
org.gradle.caching=true
org.gradle.configureondemand=true
org.gradle.jvmargs=-Xmx4g
org.gradle.vfs.watch=true

#Bintray publish workaround
systemProp.org.gradle.internal.publish.checksums.insecure=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 1 addition & 3 deletions rsocket-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ kotlin {
val commonMain by getting {
dependencies {
api("io.ktor:ktor-io:$ktorVersion")
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion") {
version { strictly(kotlinxCoroutinesVersion) }
}
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
}
}
val commonTest by getting {
Expand Down
9 changes: 5 additions & 4 deletions rsocket-test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@ kotlin {
api(kotlin("test-common"))
api(kotlin("test-annotations-common"))

api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion") {
version { strictly(kotlinxCoroutinesVersion) }
}
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
api("io.ktor:ktor-utils:$ktorVersion")
api("app.cash.turbine:turbine:$turbineVersion")
api("app.cash.turbine:turbine:$turbineVersion") {
//depends on coroutines without native-mt suffix, so need to exclude it
exclude("org.jetbrains.kotlinx")
}
}
}
val jvmMain by getting {
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

pluginManagement {
repositories {
maven("https://dl.bintray.com/kotlin/kotlinx")
mavenCentral()
gradlePluginPortal()
mavenCentral()
maven("https://dl.bintray.com/kotlin/kotlinx")
}

plugins {
Expand Down