Skip to content
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.

Sign up for GitHub

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

Add FixedIn to ZipMergingTask #609

Merged
merged 1 commit into from
Nov 1, 2023
Merged

Add FixedIn to ZipMergingTask #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/groovy/org/gradle/android/workarounds/ZipMergingTaskWorkaround.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.gradle.api.Task
* Disables caching of ZipMergingTask which is mostly disk bound and
* unlikely to provide positive performance benefits.
*/
@AndroidIssue(introducedIn = "3.5.0", fixedIn = [], link="https://issuetracker.google.com/issues/200002454")
@AndroidIssue(introducedIn = "3.5.0", fixedIn = "8.1.0-alpha10", link="https://issuetracker.google.com/issues/200002454")
@CompileStatic
class ZipMergingTaskWorkaround implements Workaround {

Expand Down
6 changes: 3 additions & 3 deletions src/test/groovy/org/gradle/android/WorkaroundTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ class WorkaroundTest extends Specification {
workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
where:
androidVersion | expectedWorkarounds
"8.3.0-alpha11" | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage']
"8.2.0-rc02" | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
"8.1.2" | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
"8.3.0-alpha11" | ['MergeSourceSetFolders', 'JdkImage']
"8.2.0-rc02" | ['MergeSourceSetFolders', 'JdkImage', 'PackageForUnitTest']
"8.1.2" | ['MergeSourceSetFolders', 'JdkImage', 'PackageForUnitTest']
"8.0.2" | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
"7.4.2" | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
"7.3.1" | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
Expand Down