Merge pull request #635 from gradle/gk/MergeSourceSetFolders_fixed_8.4.0alpha01

Removed support for MergeSourceSetFolders in 8.4.0

Author: ribafish

src/main/groovy/org/gradle/android/workarounds/MergeSourceSetFoldersWorkaround.groovy

@@ -11,7 +11,7 @@ import org.gradle.api.Task
  * performance benefits.
  */
 @CompileStatic
-@AndroidIssue(introducedIn = "3.5.0", fixedIn = [], link = "https://issuetracker.google.com/issues/194804421")
+@AndroidIssue(introducedIn = "3.5.0", fixedIn = ["8.4.0-alpha01"], link = "https://issuetracker.google.com/issues/194804421")
 class MergeSourceSetFoldersWorkaround implements Workaround {
     private static final String CACHING_ENABLED_PROPERTY = "org.gradle.android.cache-fix.MergeSourceSetFolders.caching.enabled"
 

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.4.0-alpha01" | ['MergeSourceSetFolders', 'JdkImage']
+        "8.4.0-alpha01" | ['JdkImage']
         "8.3.0-beta01" | ['MergeSourceSetFolders', 'JdkImage']
         "8.2.0"         | ['MergeSourceSetFolders', 'JdkImage', 'PackageForUnitTest']
         "8.1.4"         | ['MergeSourceSetFolders', 'JdkImage', 'PackageForUnitTest']