Skip to content
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
merged 14 commits into from
Jun 8, 2021
Merged

Upgrade to Gradle 7.0 and AGP 4.2.1 #154

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
96c3c3f
Bump versions to Gradle 7.0.2
jkasten2 Jun 6, 2021
2c36bc1
Replaced "compile" with" implementation"
jkasten2 Jun 6, 2021
b438dc2
Upgraded to the testing framework Spock 2.0
jkasten2 Jun 6, 2021
ac872a6
Switched to maven-publish for local testing
jkasten2 Jun 6, 2021
92f6c49
Moved jcenter last so we don't get old versions
jkasten2 Jun 6, 2021
cea0d85
Added required duplicatesStrategy for Gradle 7
jkasten2 Jun 6, 2021
5c44161
DefaultVersionSelectorScheme required constructor
jkasten2 Jun 6, 2021
761d84a
Upgraded to AGP 4.2.1
jkasten2 Jun 6, 2021
b2fa207
Updated .lockfile for all the changes in this PR
jkasten2 Jun 6, 2021
ddf798b
Bump OneSignal in tests so they pass
jkasten2 Jun 6, 2021
3eec256
SdkVersion 26 test is flaky with Gradle 7
jkasten2 Jun 6, 2021
ec80816
Lower APG to 4.1.1 for api 26 test
jkasten2 Jun 6, 2021
8122b38
JVM 8 work around for Metaspace error
jkasten2 Jun 7, 2021
c5e3919
fixup! Added required duplicatesStrategy for Gradle 7
jkasten2 Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added required duplicatesStrategy for Gradle 7
  • Loading branch information
@jkasten2
jkasten2 committed Jun 6, 2021
commit cea0d85b527bfe4e2c15e45897bfbb3b1985147a
4 changes: 4 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ test {
}
}

processResources {
// Required by Gradle 7
duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit, is this code well code formatted?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in commit c5e3919

}

// Build for Local Testing
publishing {
Expand Down