commit e963edeb546cfdaa2d8143055a0e6da168507bff
author Roman Elizarov <elizarov@gmail.com> Sat Oct 06 16:24:23 2018 +0200
committer Roman Elizarov <elizarov@gmail.com> Sat Oct 06 16:24:23 2018 +0200
tree 92bf96f724ab7f29e5a7405ef4640d2a688f964f
parent 9da9485a43ab9a39d698b7c2d0c90e14638f4f95
parent 06e85d5aec2a7e82d741a73f876465ffec49d56a

Merge branch 'master' into develop

core/kotlinx-coroutines-core/src/scheduling/Dispatcher.kt

diff --git a/core/kotlinx-coroutines-core/src/scheduling/Dispatcher.kt b/core/kotlinx-coroutines-core/src/scheduling/Dispatcher.kt
index 7a718f5..7e359fb 100644
--- a/core/kotlinx-coroutines-core/src/scheduling/Dispatcher.kt
+++ b/core/kotlinx-coroutines-core/src/scheduling/Dispatcher.kt
@@ -20,6 +20,11 @@
     override fun close() {
         throw UnsupportedOperationException("$DEFAULT_SCHEDULER_NAME cannot be closed")
     }
+
+    override fun toString(): String = DEFAULT_SCHEDULER_NAME
+
+    @InternalCoroutinesApi
+    fun toDebugString(): String = super.toString()
 }
 
 /**

gradle/atomicfu-common.gradle

diff --git a/gradle/atomicfu-common.gradle b/gradle/atomicfu-common.gradle
index 9a55e17..236fbfd 100644
--- a/gradle/atomicfu-common.gradle
+++ b/gradle/atomicfu-common.gradle
@@ -3,5 +3,5 @@
  */
 
 dependencies {
-    compile "org.jetbrains.kotlinx:atomicfu-common:$atomicFU_version"
+    compileOnly "org.jetbrains.kotlinx:atomicfu-common:$atomicFU_version"
 }
\ No newline at end of file