From 5731fb47ce4664351b96208b70a1974447be5e63 Mon Sep 17 00:00:00 2001
From: Oleg Yukhnevich <whyoleg@gmail.com>
Date: Wed, 14 Oct 2020 22:19:04 +0300
Subject: [PATCH] fix native coroutines dependency update gradle remove todo

---
 README.md                                |  2 +-
 TODO.md                                  | 13 -------------
 build.gradle.kts                         |  3 +--
 gradle.properties                        |  1 +
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 rsocket-core/build.gradle.kts            |  4 +---
 rsocket-test/build.gradle.kts            |  9 +++++----
 settings.gradle.kts                      |  4 ++--
 8 files changed, 12 insertions(+), 26 deletions(-)
 delete mode 100644 TODO.md

diff --git a/README.md b/README.md
index cccdddf43..6574038a9 100644
--- a/README.md
+++ b/README.md
@@ -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
 
diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index 3c25426a6..000000000
--- a/TODO.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# TODO
-- [ ] Spec test ([TODO] TCK)
-- [ ] Frame with length support
-- [ ] Fragmentation + Reassembly
-- [ ] Lease
-- [ ] Resume
-- [ ] Composite metadata
-- [ ] Tracing
-- [ ] Security
-- [ ] Routing
-- [ ] Routing and Forwarding
-- [ ] Load balancing
-- [ ] ? Micrometer
diff --git a/build.gradle.kts b/build.gradle.kts
index 1a18d143d..a190479a7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -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")
     }
@@ -48,9 +47,9 @@ plugins {
 
 allprojects {
     repositories {
+        mavenCentral()
         jcenter()
         maven("https://dl.bintray.com/kotlin/kotlinx")
-        mavenCentral()
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 8816db47b..5854264f8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -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
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a050d9b3a..23fc06a07 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/rsocket-core/build.gradle.kts b/rsocket-core/build.gradle.kts
index 9d8a29339..64fc759ae 100644
--- a/rsocket-core/build.gradle.kts
+++ b/rsocket-core/build.gradle.kts
@@ -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 {
diff --git a/rsocket-test/build.gradle.kts b/rsocket-test/build.gradle.kts
index ded9dccf2..84eee99c8 100644
--- a/rsocket-test/build.gradle.kts
+++ b/rsocket-test/build.gradle.kts
@@ -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 {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 273e3686b..c41289c3c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,9 +16,9 @@
 
 pluginManagement {
     repositories {
-        maven("https://dl.bintray.com/kotlin/kotlinx")
-        mavenCentral()
         gradlePluginPortal()
+        mavenCentral()
+        maven("https://dl.bintray.com/kotlin/kotlinx")
     }
 
     plugins {