Disable CC for com.github.johnrengelman.shadow only

melix · Aug 25, 2024 · 3442315 · 3442315
1 parent 18eff67
commit 3442315
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/src/funcTest/groovy/me/champeau/jmh/AbstractFuncSpec.groovy b/src/funcTest/groovy/me/champeau/jmh/AbstractFuncSpec.groovy
@@ -59,6 +59,13 @@ abstract class AbstractFuncSpec extends Specification {
         noConfigurationCacheReason = reason
     }
 
+    /**
+     * TODO: remove this once we bumped min Shadow support to 8.1.1 or dropped it.
+     */
+    protected void disableConfigCacheForShadow(String pluginId) {
+        noConfigurationCacheReason = 'com.github.johnrengelman.shadow supports CC from 8.1.1+'
+    }
+
     File getProjectDir() {
         temporaryFolder
     }

diff --git a/src/funcTest/groovy/me/champeau/jmh/JmhWithShadowPluginSpec.groovy b/src/funcTest/groovy/me/champeau/jmh/JmhWithShadowPluginSpec.groovy
@@ -34,10 +34,7 @@ class JmhWithShadowPluginSpec extends AbstractFuncSpec {
         rootBuildFile.text = buildFileContent
 
         usingGradleVersion(gradleVersion)
-        // TODO: com.github.johnrengelman.shadow supports CC from 8.1.1+.
-        if (shadowPlugin == 'com.github.johnrengelman.shadow') {
-            withoutConfigurationCache('shadow plugin unsupported')
-        }
+        disableConfigCacheForShadow(shadowPlugin)
 
         when:
         def result = build("jmh")

diff --git a/src/funcTest/groovy/me/champeau/jmh/ProjectWithDuplicateClassesSpec.groovy b/src/funcTest/groovy/me/champeau/jmh/ProjectWithDuplicateClassesSpec.groovy
@@ -63,7 +63,7 @@ class ProjectWithDuplicateClassesSpec extends AbstractFuncSpec {
 
         given:
         usingGradleVersion(gradleVersion)
-        withoutConfigurationCache('shadow plugin unsupported')
+        disableConfigCacheForShadow(shadowPlugin)
 
         and:
         buildFile << """
@@ -128,7 +128,7 @@ class ProjectWithDuplicateClassesSpec extends AbstractFuncSpec {
 
         given:
         usingGradleVersion(gradleVersion)
-        withoutConfigurationCache('shadow plugin unsupported')
+        disableConfigCacheForShadow(shadowPlugin)
 
         and:
         buildFile << """

diff --git a/src/funcTest/groovy/me/champeau/jmh/ProjectWithDuplicateDependenciesSpec.groovy b/src/funcTest/groovy/me/champeau/jmh/ProjectWithDuplicateDependenciesSpec.groovy
@@ -54,7 +54,7 @@ class ProjectWithDuplicateDependenciesSpec extends AbstractFuncSpec {
 
         given:
         usingGradleVersion(gradleVersion)
-        withoutConfigurationCache('shadow plugin unsupported')
+        disableConfigCacheForShadow(shadowPlugin)
 
         and:
         createBuildFile("""