-
-
Notifications
You must be signed in to change notification settings - Fork 288
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
refactor: Bump ReVanced Patcher & merge integrations by using ReVanced Patches Gradle plugin #3462
Conversation
… YouTube videos (#525)
…tartup The application crashes sporadically when a field is not initialized yet in a static context.
BREAKING CHANGE: The class `MicroGSupport` has been renamed to `GmsCoreSupport`
…wing for non English language
… from freezing the UI (#532)
… Shorts playback (#533)
…nternet connection (#537)
Co-authored-by: oSumAtrIX <[email protected]> Co-authored-by: LisoUseInAIKyrios <[email protected]>
…efore allowing the first Short to start playback (#538)
Co-authored-by: oSumAtrIX <[email protected]>
…tems on app startup
Co-authored-by: oSumAtrIX <[email protected]>
…once if using a slow playback speed
Co-authored-by: LisoUseInAIKyrios <[email protected]> Co-authored-by: oSumAtrIX <[email protected]>
@LisoUseInAIKyrios This PR is now ready for review/mergeing. Before we merge I will try to force push the integrations history into this branch and merge by rebasing. Since there are many objects the repository will grew a bit on size due to stuff like the Gradle wrapper being committed to. I could rewrite history in a way where only commits to the source files are included. This skews true history, but avoids bloating the repo with commits that will be forgotten anyways in a while. What do you say? The PR surely has some errors/mistakes which we will see when it reaches main at least. Before merging this, I will to do a superficial test. |
Only the history of source code files is useful, so that would be preferable. I can review tomorrow. Build failed with out of memory. Locally I had to increase gradle memory argument as recently it had been complaining about running low.
|
Merging this means all other current PRs need to be rebased and resolve merge conflicts. I can take up on some. Since sources are moved its simply a matter of rebasing, and during merge conflict resolution copy over the old source files to the new place and apply the necessary changes. |
0a6506c
to
a8da1d9
Compare
I have merged both histories now: First the integration commits are rewritten only to include changes to the source files: The rewrite moved all commits to the source files to a directory "intregrations". This allowed for a merge commit without conflicts into the patches repo. The merge was stopped with Regarding new commits to this branch, I am unsure how git handles this merge as the last commit. So far, I have been doing fix commits and then squashing them with the Bump patcher commit, but since there's a merge in between, this may not work. In this case the last commit can be reverted, the commits pushed and then I can do them again. |
Everything seems to be working ok. |
2593bd0
to
e798a9c
Compare
In a different commit, the packages of the patch files could be reorganized, as they still use the old settings groups of |
I was thinking of getting rid of the structure entirely and just structure by package name. All patch files would be next to each other. Fingerprint files could be named the same way as the corresponding patch too (HideAdsFingerprints.kt for example). I think this is easier to read. |
Yeah since most patches have only 2 files that would work. |
About
Todo
EXTENSION_CLASS_DESCRIPTOR
or localextensionClassDescriptor
, for example) (Should be converted to extensionClassDescriptor eventually)Merge instructions
The first commit may have residues from the second commit.