New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove unnecessary -keep rule for AndroidDispatcherFactory, AndroidEx… #3263
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this change should also be in
META-INF/com.android.tools/proguard/coroutines.pro
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doh! Done.
Do you know why in
r8-from-1.6.0
there is:but in
r8-upto-1.6.0
there is:E.g. Maybe R8 applied these rules in an odd way before 1.6, or maybe the rule is just wrong in the upto-1.6.0 file (and the file should be deleted).