Merge branch 'master' into develop

qwwdfsad · qwwdfsad · commit aa38c17e951f · 2018-09-26T15:07:09.000+03:00
diff --git a/ui/kotlinx-coroutines-javafx/src/JavaFxDispatcher.kt b/ui/kotlinx-coroutines-javafx/src/JavaFxDispatcher.kt
@@ -30,7 +30,7 @@ public sealed class JavaFxDispatcher : CoroutineDispatcher(), Delay
  * @suppress **Deprecated**: Use [Dispatchers.JavaFx].
  */
 @Deprecated(
-    message = "Use Dispatchers.Main",
+    message = "Use Dispatchers.JavaFx",
     replaceWith = ReplaceWith("Dispatchers.JavaFx",
         imports = ["kotlinx.coroutines.experimental.Dispatchers", "kotlinx.coroutines.experimental.javafx.JavaFx"])
 )

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public sealed class JavaFxDispatcher : CoroutineDispatcher(), Delay`
`30`	`30`	`* @suppress Deprecated: Use [Dispatchers.JavaFx].`
`31`	`31`	`*/`
`32`	`32`	`@Deprecated(`
`33`		`- message = "Use Dispatchers.Main",`
	`33`	`+ message = "Use Dispatchers.JavaFx",`
`34`	`34`	`replaceWith = ReplaceWith("Dispatchers.JavaFx",`
`35`	`35`	`imports = ["kotlinx.coroutines.experimental.Dispatchers", "kotlinx.coroutines.experimental.javafx.JavaFx"])`
`36`	`36`	`)`