Update ProGuard rules to keep Android-specific classes as well

qwwdfsad · qwwdfsad · commit 39c7ca5eb931 · 2019-02-18T14:58:29.000+03:00
Workaround for #983
diff --git a/core/kotlinx-coroutines-core/resources/META-INF/proguard/coroutines.pro b/core/kotlinx-coroutines-core/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.** {
diff --git a/core/kotlinx-coroutines-test/resources/META-INF/proguard/coroutines.pro b/core/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.** {
diff --git a/ui/kotlinx-coroutines-android/animation-app/app/proguard-rules.pro b/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>;
 }
diff --git a/ui/kotlinx-coroutines-android/example-app/app/proguard-rules.pro b/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>;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}`
`2`	`2`	`-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}`
	`3`	`+-keepnames class kotlinx.coroutines.android.AndroidExceptionPreHandler {}`
	`4`	`+-keepnames class kotlinx.coroutines.android.AndroidDispatcherFactory {}`
	`5`	`+`
`3`	`6`	`-keepclassmembernames class kotlinx.** {`
`4`	`7`	`volatile <fields>;`
`5`	`8`	`}`