Inline legacy com.android.tools:common and com.android.tools:sdk-common classes to unblock Dolphin upgrade #636
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
…on classes to unblock Dolphin upgrade
luis-cortes
approved these changes
Nov 28, 2022
JakeWharton
approved these changes
Nov 28, 2022
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.
Bumping to layoutlib Dolphin has a dependency on a version of
layoutlib-apiwhich removes RenderParamsFlags.One of those flags (
FLAG_KEY_APPLICATION_PACKAGE) is replaced by a new method, LayoutlibCallback.getApplicationId.However, bumping
layoutlib-apitransitively bumpscom.android.tools:commonpast 27.2.2 whereFolderWrapper(File)no longer exists.The use of
FolderWrapper(File)is related to the use of the deprecatedResourceRepository, referenced in #524.On a separate note, bumping sdk-common to 27.0.0 fails, because that same deprecated
ResourceRepositoryis removed.Both of these should be obsoleted once we rewrite the internal resource loading mechanism. However, since this is currently blocking support for Dolphin which is blocking support for Electric Eel, which is blocking support for SDK 33, let's inline both the
com.android.ioclasses andcom.android.ide.common.resources.deprecatedto keep current behavior and allow bumpingcommonandsdk-commonto more recent versions.Removal of
FolderWrapper(File)et al. from common: https://android.googlesource.com/platform/tools/base/+/1accd73583827d68371c8bc32af0645a20a3e3a6Removal of
ResourceRepositoryet al. from sdk-common: https://android.googlesource.com/platform/tools/base/+/f870b9e262973c0742380e8a5fbb74977b44fa14PS: Along the way,
sdk-commonalso removed its direct dependency ontrove4j(related to JCenter deprecation?): https://android.googlesource.com/platform/tools/base/+/1be1730b1c5e2b3bce548c015c00172c217eeabfso we also add that directly here.