This repository has been archived by the owner on Oct 31, 2022. It is now read-only.
Upgrade to Gradle 7.0 and AGP 4.2.1 #154
Merged
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
* "compile" as been deprecated for awhile and has been completely dropped in Gradle 7
* Required since Gradle 7 upgraded to Groovy 3.0 * Added required useJUnitPlatform() line for Spock 2
* uploadArchives is no longer supported by Gradle 7
* jcenter is no longer being updated so it should be last in the repo list
Jeasmine
approved these changes
Jun 7, 2021
build.gradle
Outdated
| @@ -82,6 +82,10 @@ test { | |||
| } | |||
| } | |||
|
|
|||
| processResources { | |||
| // Required by Gradle 7 | |||
| duplicatesStrategy(DuplicatesStrategy.EXCLUDE) | |||
There was a problem hiding this comment.
Nit, is this code well code formatted?
| @@ -0,0 +1,31 @@ | |||
| package com.onesignal.androidsdk; | |||
There was a problem hiding this comment.
The commit message has some types; maybe you want to update it. 😬
- DefaultVersionSelectorScheme now requires a VersionParser as part of
it's constructor parameters. - This introduced in Gradle 4.7. or 4.8 but the old deprecated
constructor was dropped in 7.0 - Since we want to continue to support Gradle versions older than 4.7
created DefaultVersionSelectorSchemeCompat to handle constructing
a DefaultVersionSelectorScheme instance to handle the fallback logic
There was a problem hiding this comment.
Good catches!
Fixed with git rebase -i on selected reword and force pushed.
See commit 5c44161 for the fix
* DefaultVersionSelectorScheme now requires a VersionParser as part of it's constructor parameters. * This introduced in Gradle 4.7. or 4.8 but the old deprecated constructor was dropped in 7.0 * Since we want to continue to support Gradle versions older than 4.7 created DefaultVersionSelectorSchemeCompat to handle constructing a DefaultVersionSelectorScheme instance to handle the fallback logic * Removed intersectCompat to always use our VersionCompatHelpers.intersect. - Found out that VersionRangeSelector.intersect was an internal method and was only present from Gradle 4.3 to 4.9. I was not able to find a direct replacement so for consistency always use our VersionCompatHelpers
* Added android.enableD8.desugaring=false as it was required for tests to pass. - Nothing a end user has to change, just the way our tests are setup.
* Use Gradle 6.7.1 instead for this test
jkasten2
force-pushed
the
upgrade/gradle_7.0
branch
from
0d2156f to
c5e3919
Compare
Jeasmine
approved these changes
Jun 8, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
One Line Summary
Updated to Gradle 7.0 and fixed a number compatibility issues with the upgrade.
Details
build.gradle, see commit-by-commit for detailsDefaultVersionSelectorSchemewhichDefaultVersionSelectorSchemeCompatwas added to handle both old a new Gradle versionsThis change is