Skip to content
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.

Sign up for GitHub

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

Jump to bottom

R8 has built-in support for ServiceLoader, Proguard rules need update #3111

Closed
vvb2060 opened this issue Dec 27, 2021 · 1 comment
Closed

R8 has built-in support for ServiceLoader, Proguard rules need update #3111

vvb2060 opened this issue Dec 27, 2021 · 1 comment

Comments

@vvb2060
Copy link

vvb2060 commented Dec 27, 2021 •
edited
Loading

https://r8.googlesource.com/r8/+/c93796dcf5f2f74d7c3817926cbfbf3122096a74

    private final ProguardPathFilter.Builder adaptResourceFilenames =
        ProguardPathFilter.builder()
            .addPattern(ProguardPathList.builder().addFileName("META-INF/services/*").build());
    private final ProguardPathFilter.Builder adaptResourceFileContents =
        ProguardPathFilter.builder()
            .addPattern(ProguardPathList.builder().addFileName("META-INF/services/*").build());

R8 use -adaptresourcefilenames and -adaptresourcefilecontents to handle META-INF/services/*, which I think is better than -keep or -keepnames: https://www.guardsquare.com/manual/configuration/examples#resourcefiles

The following rules can be removed:

-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}
-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}

kotlinx.coroutines/ui/kotlinx-coroutines-android/src/AndroidExceptionPreHandler.kt

Lines 13 to 15 in 722cf5f

@Keep
internal class AndroidExceptionPreHandler :
AbstractCoroutineContextElement(CoroutineExceptionHandler), CoroutineExceptionHandler

@vvb2060 vvb2060 mentioned this issue Dec 31, 2021
Merged
@agrieve
Copy link
Contributor

agrieve commented Apr 8, 2022

I was just looking at this as well, and it turns out that:
a) There is still a -keep rule in kotlinx-coroutines-android that should be removed, and
b) R8 natively supports META-INF/services / ServiceLoader.load since 1.5, so there's also no need for -adaptresourcefilecontents / -adaptresourcefilenames

pablobaxter pushed a commit to pablobaxter/kotlinx.coroutines that referenced this issue Sep 14, 2022
@agrieve @pablobaxter
Remove unnecessary -keep rules for services (Kotlin#3263)
69dde8d 
Fixes Kotlin#3111
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@agrieve @vvb2060