forked from Kotlin/kotlinx.coroutines
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove unnecessary -keep rules for services (Kotlin#3263)
Fixes Kotlin#3111
- Loading branch information
1 parent
20d3d93
commit 69dde8d
Showing
6 changed files
with
15 additions
and
16 deletions.
There are no files selected for viewing
3 changes: 2 additions & 1 deletion
3
ui/kotlinx-coroutines-android/resources/META-INF/com.android.tools/proguard/coroutines.pro
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
# When editing this file, update the following files as well: | ||
# - META-INF/com.android.tools/r8-upto-1.6.0/coroutines.pro | ||
# - META-INF/com.android.tools/r8-upto-3.0.0/coroutines.pro | ||
# - META-INF/proguard/coroutines.pro | ||
|
||
-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;} | ||
-keep class kotlinx.coroutines.android.AndroidExceptionPreHandler {*;} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 0 additions & 9 deletions
9
...linx-coroutines-android/resources/META-INF/com.android.tools/r8-upto-1.6.0/coroutines.pro
This file was deleted.
Oops, something went wrong.
10 changes: 10 additions & 0 deletions
10
...linx-coroutines-android/resources/META-INF/com.android.tools/r8-upto-3.0.0/coroutines.pro
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# When editing this file, update the following files as well for AGP 3.6.0+: | ||
# - META-INF/com.android.tools/proguard/coroutines.pro | ||
# - META-INF/proguard/coroutines.pro | ||
|
||
# After R8 3.0.0 (or probably sometime before that), R8 learned how to optimize | ||
# classes mentioned in META-INF/services files, and explicitly -keeping them | ||
# disables these optimizations. | ||
# https://github.com/Kotlin/kotlinx.coroutines/issues/3111 | ||
-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;} | ||
-keep class kotlinx.coroutines.android.AndroidExceptionPreHandler {*;} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters