Merge branch 'master' into develop

RUANHAOANDROID · Jun 6, 2019 · 03b9bd1 · 03b9bd1
2 parents 18e3a4a + a97fd43
commit 03b9bd1
Show file tree

Hide file tree

Showing 13 changed files with 210 additions and 253 deletions.
diff --git a/docs/channels.md b/docs/channels.md
@@ -19,7 +19,7 @@ class ChannelsGuideTest {
 
 <!--- TOC -->
 
-* [Channels (experimental)](#channels-experimental)
+* [Channels](#channels)
  * [Channel basics](#channel-basics)
  * [Closing and iteration over channels](#closing-and-iteration-over-channels)
  * [Building channel producers](#building-channel-producers)
@@ -33,15 +33,11 @@ class ChannelsGuideTest {
 
 <!--- END_TOC -->
 
-## Channels (experimental) 
+## Channels
 
 Deferred values provide a convenient way to transfer a single value between coroutines.
 Channels provide a way to transfer a stream of values.
 
-> Channels are an experimental feature of `kotlinx.coroutines`. Their API is expected to 
-evolve in the upcoming updates of the `kotlinx.coroutines` library with potentially
-breaking changes.
-
 ### Channel basics
 
 A [Channel] is conceptually very similar to `BlockingQueue`. One key difference is that