From 6f3854c36de7668d0262fd1f9ae6dd2f9c331750 Mon Sep 17 00:00:00 2001 From: Inaki Villar Date: Tue, 29 Aug 2023 14:05:10 -0700 Subject: [PATCH] removing support for PackageForUnitTest workaround in 8.3 --- .../android/workarounds/PackageForUnitTestWorkaround.groovy | 2 +- src/test/groovy/org/gradle/android/WorkaroundTest.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/org/gradle/android/workarounds/PackageForUnitTestWorkaround.groovy b/src/main/groovy/org/gradle/android/workarounds/PackageForUnitTestWorkaround.groovy index 94446c50..063798ee 100644 --- a/src/main/groovy/org/gradle/android/workarounds/PackageForUnitTestWorkaround.groovy +++ b/src/main/groovy/org/gradle/android/workarounds/PackageForUnitTestWorkaround.groovy @@ -6,7 +6,7 @@ import org.gradle.android.AndroidIssue import org.gradle.api.Project import org.gradle.api.Task -@AndroidIssue(introducedIn = "3.5.0-alpha05", link = "https://issuetracker.google.com/issues/292114808") +@AndroidIssue(introducedIn = "3.5.0-alpha05", fixedIn = "8.3.0-alpha01", link = "https://issuetracker.google.com/issues/292114808") @CompileStatic class PackageForUnitTestWorkaround implements Workaround { private static final String CACHING_ENABLED_PROPERTY = "org.gradle.android.cache-fix.PackageForUnitTest.caching.enabled" diff --git a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy index 7eb2a32a..3e08ba9f 100644 --- a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy +++ b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy @@ -12,7 +12,7 @@ class WorkaroundTest extends Specification { workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort() where: androidVersion | expectedWorkarounds - "8.3.0-alpha01" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest'] + "8.3.0-alpha01" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage'] "8.2.0-beta01" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest'] "8.1.1" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest'] "8.0.2" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']