Merge branch 'master' into develop

Author: elizarov

docs/composing-suspending-functions.md

@@ -350,12 +350,12 @@ import kotlinx.coroutines.*
 import kotlin.system.*
 
 fun main() = runBlocking<Unit> {
-    //sampleStart
+//sampleStart
     val time = measureTimeMillis {
         println("The answer is ${concurrentSum()}")
     }
     println("Completed in $time ms")
-    //sampleEnd    
+//sampleEnd    
 }
 
 suspend fun concurrentSum(): Int = coroutineScope {

kotlinx-coroutines-core/jvm/resources/META-INF/proguard/coroutines.pro

@@ -1,6 +1,8 @@
 # ServiceLoader support
 -keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
 -keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+-keepnames class kotlinx.coroutines.android.AndroidExceptionPreHandler {}
+-keepnames class kotlinx.coroutines.android.AndroidDispatcherFactory {}
 
 # Most of volatile fields are updated with AFU and should not be mangled
 -keepclassmembernames class kotlinx.** {

kotlinx-coroutines-test/resources/META-INF/proguard/coroutines.pro

@@ -1,5 +1,7 @@
 # ServiceLoader support
 -keepnames class kotlinx.coroutines.test.internal.TestMainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.android.AndroidExceptionPreHandler {}
+-keepnames class kotlinx.coroutines.android.AndroidDispatcherFactory {}
 
 # Most of volatile fields are updated with AFU and should not be mangled
 -keepclassmembernames class kotlinx.** {

ui/kotlinx-coroutines-android/animation-app/app/proguard-rules.pro

@@ -1,5 +1,8 @@
 -keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
 -keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+-keepnames class kotlinx.coroutines.android.AndroidExceptionPreHandler {}
+-keepnames class kotlinx.coroutines.android.AndroidDispatcherFactory {}
+
 -keepclassmembernames class kotlinx.** {
     volatile <fields>;
 }

ui/kotlinx-coroutines-android/example-app/app/proguard-rules.pro

@@ -1,5 +1,8 @@
 -keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
 -keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+-keepnames class kotlinx.coroutines.android.AndroidExceptionPreHandler {}
+-keepnames class kotlinx.coroutines.android.AndroidDispatcherFactory {}
+
 -keepclassmembernames class kotlinx.** {
     volatile <fields>;
 }