Skip to content

Commit 3f79945

Browse files
authored
fix native coroutines dependency (#107)
update gradle remove todo
1 parent 4e06871 commit 3f79945

File tree

8 files changed

+12
-26
lines changed

8 files changed

+12
-26
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Transports are implemented based on [ktor](https://github.com/ktorio/ktor) to en
1717
So it depends on `ktor` engines for available transports and platforms (JVM, JS, Native):
1818
* JVM - TCP and WebSocket for both client and server
1919
* JS - WebSocket client only
20-
* [SOON] Native - TCP for both client and server
20+
* Native - TCP for both client and server (linux x64, macos, ios, watchos, tvos)
2121

2222
## Interactions
2323

TODO.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ buildscript {
3030
val kotlinxAtomicfuVersion: String by rootProject
3131

3232
dependencies {
33-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
3433
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
3534
classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:$kotlinxAtomicfuVersion")
3635
}
@@ -48,9 +47,9 @@ plugins {
4847

4948
allprojects {
5049
repositories {
50+
mavenCentral()
5151
jcenter()
5252
maven("https://dl.bintray.com/kotlin/kotlinx")
53-
mavenCentral()
5453
}
5554
}
5655

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ org.gradle.parallel=false
5151
org.gradle.caching=true
5252
org.gradle.configureondemand=true
5353
org.gradle.jvmargs=-Xmx4g
54+
org.gradle.vfs.watch=true
5455

5556
#Bintray publish workaround
5657
systemProp.org.gradle.internal.publish.checksums.insecure=true

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616

1717
distributionBase=GRADLE_USER_HOME
1818
distributionPath=wrapper/dists
19-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
19+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists

rsocket-core/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ kotlin {
3131
val commonMain by getting {
3232
dependencies {
3333
api("io.ktor:ktor-io:$ktorVersion")
34-
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion") {
35-
version { strictly(kotlinxCoroutinesVersion) }
36-
}
34+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
3735
}
3836
}
3937
val commonTest by getting {

rsocket-test/build.gradle.kts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ kotlin {
3030
api(kotlin("test-common"))
3131
api(kotlin("test-annotations-common"))
3232

33-
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion") {
34-
version { strictly(kotlinxCoroutinesVersion) }
35-
}
33+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
3634
api("io.ktor:ktor-utils:$ktorVersion")
37-
api("app.cash.turbine:turbine:$turbineVersion")
35+
api("app.cash.turbine:turbine:$turbineVersion") {
36+
//depends on coroutines without native-mt suffix, so need to exclude it
37+
exclude("org.jetbrains.kotlinx")
38+
}
3839
}
3940
}
4041
val jvmMain by getting {

settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
pluginManagement {
1818
repositories {
19-
maven("https://dl.bintray.com/kotlin/kotlinx")
20-
mavenCentral()
2119
gradlePluginPortal()
20+
mavenCentral()
21+
maven("https://dl.bintray.com/kotlin/kotlinx")
2222
}
2323

2424
plugins {

0 commit comments

Comments
 (0)