Skip to content

Commit

Permalink
Merge branch 'gk/agp8.4.0alpha01' into gk/MergeSourceSetFolders_fixed…
Browse files Browse the repository at this point in the history
…_8.4.0alpha01

* gk/agp8.4.0alpha01:
  Updated changes.md
  Updated to AGP 8.3.0-beta01

# Conflicts:
#	src/test/groovy/org/gradle/android/WorkaroundTest.groovy
  • Loading branch information
ribafish committed Jan 3, 2024

Verified

This commit was signed with the committer’s verified signature.
ribafish Gašper Kojek
2 parents b988314 + 0316ee1 commit 78062b4
Showing 4 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion release/changes.md
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
- [NEW] Run tests against AGP 8.4.0-alpha01
2 changes: 1 addition & 1 deletion src/main/resources/versions.json
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
"8.4.0-alpha01": [
"8.5"
],
"8.3.0-alpha18": [
"8.3.0-beta01": [
"8.5"
],
"8.2.0": [
2 changes: 1 addition & 1 deletion src/test/groovy/org/gradle/android/WorkaroundTest.groovy
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class WorkaroundTest extends Specification {
where:
androidVersion | expectedWorkarounds
"8.4.0-alpha01" | ['JdkImage']
"8.3.0-alpha18" | ['MergeSourceSetFolders', 'JdkImage']
"8.3.0-beta01" | ['MergeSourceSetFolders', 'JdkImage']
"8.2.0" | ['MergeSourceSetFolders', 'JdkImage', 'PackageForUnitTest']
"8.1.4" | ['MergeSourceSetFolders', 'JdkImage', 'PackageForUnitTest']
"8.0.2" | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']

0 comments on commit 78062b4

Please sign in to comment.