KTOR-7479 Quick fix for compatibility with R8 full mode #4369
Conversation
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
osipxd
force-pushed
the
osipxd/createClientPlugin-obfuscation
branch
from
a55d4c8 to
377d595
Compare
osipxd
commented
Oct 4, 2024
Comment on lines
+15
to
+19
| // kType != null always returns false, so we try to get javaType anyway | ||
| kType!!.javaType | ||
| } catch (_: NullPointerException) { | ||
| // Fallback to a type without generics if we can't get KType for the given T | ||
| T::class.java |
There was a problem hiding this comment.
I will create an issue in the Kotlin project and mention its number here
Comment on lines
-52
to
-53
| object : ClientPlugin<PluginConfigT> { | ||
| override val key: AttributeKey<ClientPluginInstance<PluginConfigT>> = AttributeKey(name) |
There was a problem hiding this comment.
One of the problems was here because. typeOf call on a generic type inside a non-inline function produces something like this:
KTypeParameter var10006 = Reflection.typeParameter(new FunctionReferenceImpl(3, CreatePluginUtilsKt.class, "createClientPlugin", "createClientPlugin(Ljava/lang/String;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)Lio/ktor/client/plugins/api/ClientPlugin;", 1), "PluginConfigT", KVariance.INVARIANT, false);And it doesn't work after obfuscation.
osipxd
force-pushed
the
osipxd/createClientPlugin-obfuscation
branch
from
377d595 to
55a72a6
Compare
osipxd
force-pushed
the
osipxd/createClientPlugin-obfuscation
branch
from
8f73aae to
4127dcb
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Subsystem
Client/Server
Motivation
KTOR-7479 -
createClientPluginfails in runtime if an application is obfuscated with ProGuard/R8.Solution
The problem occurs when
typeOfis called with a generic type (ex.typeOf<List<T>>whereTis specified in function or class signature).typeOfrelies on class attributes which are stripped if R8 is running in full mode.The first problem is straightforward to solve, while the second one is tricky. As a quick solution, we just use a type without generics in case generics can't be retrieved from class attributes.
It is better to review commit-by-commit