Merge pull request #573 from gradle/iv/packageforunittest_fixed_8_3

Removing support for PackageForUnitTest workaround in 8.3

Author: cdsap

Diff for: 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 for: 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']