Support com.gradleup.shadow plugin

.github/workflows/main.yml

@@ -18,7 +18,9 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 21
+          java-version: |
+            22
+            21
       - uses: gradle/actions/setup-gradle@v4
       - name: Execute Gradle build
         run: ./gradlew build

build.gradle.kts

@@ -37,8 +37,8 @@ dependencies {
     testImplementation("org.spockframework:spock-core:2.3-groovy-3.0") {
         exclude(mapOf("group" to "org.codehaus.groovy"))
     }
+    pluginsUnderTest("com.gradleup.shadow:shadow-gradle-plugin:8.3.0")
     pluginsUnderTest("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
-    pluginsUnderTest("io.github.goooler.shadow:shadow-gradle-plugin:8.1.8")
 
     testImplementation("org.openjdk.jmh:jmh-core:$jmhVersion")
     testImplementation("org.openjdk.jmh:jmh-generator-bytecode:$jmhVersion")

src/funcTest/groovy/me/champeau/jmh/AbstractFuncSpec.groovy

@@ -30,16 +30,24 @@ abstract class AbstractFuncSpec extends Specification {
             GradleVersion.current()
     ]
 
-    protected static final List<String> TESTED_SHADOW_PLUGINS = [
-            'com.github.johnrengelman.shadow',
-            'io.github.goooler.shadow'
+    /** Plugin + min Gradle version the plugin supports. */
+    protected static final Map<String, GradleVersion> TESTED_SHADOW_PLUGINS = [
+            'com.gradleup.shadow':              GradleVersion.version('8.3'),
+            'com.github.johnrengelman.shadow':  GradleVersion.version('8.3')
     ]
 
     protected static final Map<String, String> TESTED_SHADOW_PLUGIN_FOLDERS = [
-            'com.github.johnrengelman.shadow':  'shadow',
-            'io.github.goooler.shadow':         'forked-shadow'
+            'com.gradleup.shadow':              'shadow',
+            'com.github.johnrengelman.shadow':  'shadow-old'
     ]
 
+    /** List of plugin + Gradle version combinations. */
+    protected static final List<Tuple2<String, GradleVersion>> TESTED_SHADOW_GRADLE_COMBINATIONS =
+            TESTED_SHADOW_PLUGINS.collect { shadowGradle ->
+                TESTED_GRADLE_VERSIONS.findAll { gradle -> gradle >= shadowGradle.value }
+                        .collect { gradle -> new Tuple(shadowGradle.key, gradle) }
+            }.inject([]) { a, b -> a.addAll(b); a }
+
     @TempDir
     File temporaryFolder
 

src/funcTest/groovy/me/champeau/jmh/JmhWithShadowPluginSpec.groovy

@@ -25,6 +25,9 @@ class JmhWithShadowPluginSpec extends AbstractFuncSpec {
     def "Run #language benchmarks that are packaged with Shadow plugin (#gradleVersion #language #shadowPlugin)"() {
 
         given:
+        System.err.println("LANG: $language")
+        System.err.println("G: $gradleVersion")
+        System.err.println("P: $shadowPlugin")
         usingSample("${language.toLowerCase()}-${TESTED_SHADOW_PLUGIN_FOLDERS[shadowPlugin]}-project")
         usingGradleVersion(gradleVersion)
         withoutConfigurationCache('shadow plugin unsupported')
@@ -37,10 +40,9 @@ class JmhWithShadowPluginSpec extends AbstractFuncSpec {
         benchmarksCsv.text.contains(language + 'Benchmark.sqrtBenchmark')
 
         where:
-        [language, gradleVersion, shadowPlugin] << [
-                ['Java', 'Scala'],
-                TESTED_GRADLE_VERSIONS,
-                TESTED_SHADOW_PLUGINS
-        ].combinations()
+        [language, gradleVersion, shadowPlugin] <<
+                TESTED_SHADOW_GRADLE_COMBINATIONS.collect { plugin, gradle ->
+                    ['Java', 'Scala'].collect { lang -> [lang, gradle, plugin ] }
+                }.inject([]) { a, b -> a.addAll(b); a }
     }
 }

src/funcTest/groovy/me/champeau/jmh/ProjectWithDuplicateClassesSpec.groovy

@@ -89,10 +89,7 @@ class ProjectWithDuplicateClassesSpec extends AbstractFuncSpec {
         result.task(":jmhJar").outcome == FAILED
 
         where:
-        [shadowPlugin, gradleVersion] << [
-                TESTED_SHADOW_PLUGINS,
-                TESTED_GRADLE_VERSIONS
-        ].combinations()
+        [shadowPlugin, gradleVersion] << TESTED_SHADOW_GRADLE_COMBINATIONS
     }
 
     def "Show warning for duplicate classes when DuplicatesStrategy.WARN is used (#gradleVersion)"() {
@@ -158,10 +155,7 @@ class ProjectWithDuplicateClassesSpec extends AbstractFuncSpec {
         assertDuplicateClassesWarning(gradleVersion, result.output)
 
         where:
-        [shadowPlugin, gradleVersion] << [
-                TESTED_SHADOW_PLUGINS,
-                TESTED_GRADLE_VERSIONS
-        ].combinations()
+        [shadowPlugin, gradleVersion] << TESTED_SHADOW_GRADLE_COMBINATIONS
     }
 
     private static boolean assertDuplicateClassesWarning(GradleVersion gradleVersion, String output) {

src/funcTest/groovy/me/champeau/jmh/ProjectWithDuplicateDependenciesSpec.groovy

@@ -73,10 +73,7 @@ class ProjectWithDuplicateDependenciesSpec extends AbstractFuncSpec {
         benchmarksCsv.text.contains('JavaBenchmark.sqrtBenchmark')
 
         where:
-        [shadowPlugin, gradleVersion] << [
-                TESTED_SHADOW_PLUGINS,
-                TESTED_GRADLE_VERSIONS
-        ].combinations()
+        [shadowPlugin, gradleVersion] << TESTED_SHADOW_GRADLE_COMBINATIONS
     }
 
     void createBuildFile(String plugins) {

src/funcTest/resources/java-project-with-feature-previews/build.gradle

@@ -25,16 +25,17 @@ repositories {
 // Configure Java compilation tasks to enable feature previews
 tasks.withType(JavaCompile).configureEach {
     options.compilerArgs.add("--enable-preview")
+    options.release = 22
     javaCompiler.set(javaToolchains.compilerFor {
         // Using 15 so that we can try a feature preview
-        languageVersion.set(JavaLanguageVersion.of(15))
+        languageVersion.set(JavaLanguageVersion.of(22))
     })
 }
 
 // Then configure the JMH Tasks to build with Java 15
 tasks.withType(me.champeau.jmh.WithJavaToolchain).configureEach {
     javaLauncher.set(javaToolchains.launcherFor {
-        languageVersion.set(JavaLanguageVersion.of(15))
+        languageVersion.set(JavaLanguageVersion.of(22))
     })
 }
 

src/funcTest/resources/java-forked-shadow-project/build.gradle → src/funcTest/resources/java-shadow-old-project/build.gradle

@@ -15,7 +15,7 @@
  */
 plugins {
     id 'java'
-    id 'io.github.goooler.shadow'
+	id 'com.github.johnrengelman.shadow'
     id 'me.champeau.jmh'
 }
 
@@ -26,4 +26,4 @@ repositories {
 jmh {
     resultFormat = 'csv'
     resultsFile = file('build/reports/benchmarks.csv')
-}
+}

src/funcTest/resources/java-forked-shadow-project/settings.gradle → src/funcTest/resources/java-shadow-old-project/settings.gradle

@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-rootProject.name = "java-forked-shadow-project"
+rootProject.name = "java-shadow-old-project"

src/funcTest/resources/java-shadow-project/build.gradle

@@ -15,7 +15,7 @@
  */
 plugins {
     id 'java'
-	id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
     id 'me.champeau.jmh'
 }
 
@@ -26,4 +26,4 @@ repositories {
 jmh {
     resultFormat = 'csv'
     resultsFile = file('build/reports/benchmarks.csv')
-}
+}

src/funcTest/resources/scala-forked-shadow-project/build.gradle → src/funcTest/resources/scala-shadow-old-project/build.gradle

@@ -15,7 +15,7 @@
  */
 plugins {
     id 'scala'
-    id 'io.github.goooler.shadow'
+    id 'com.gradleup.shadow'
     id 'me.champeau.jmh'
 }
 

src/funcTest/resources/scala-forked-shadow-project/settings.gradle → src/funcTest/resources/scala-shadow-old-project/settings.gradle

@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-rootProject.name = "scala-forked-shadow-project"
+rootProject.name = "scala-shadow-project"

src/funcTest/resources/scala-shadow-project/build.gradle

@@ -15,7 +15,7 @@
  */
 plugins {
     id 'scala'
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
     id 'me.champeau.jmh'
 }
 

src/funcTest/resources/scala-shadow-project/settings.gradle

@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-rootProject.name = "scala-shadow-project"
+rootProject.name = "scala-forked-shadow-project"

src/main/groovy/me/champeau/jmh/JMHPlugin.groovy

@@ -64,7 +64,7 @@ class JMHPlugin implements Plugin<Project> {
         dependencyHandler.addProvider(JMH_NAME, project.providers.provider { "${JMH_CORE_DEPENDENCY}${extension.jmhVersion.get()}" }) {}
         dependencyHandler.addProvider(JMH_NAME, project.providers.provider { "${JMH_GENERATOR_DEPENDENCY}${extension.jmhVersion.get()}" }) {}
 
-        def hasShadow = project.plugins.findPlugin('com.github.johnrengelman.shadow') != null || project.plugins.findPlugin('io.github.goooler.shadow') != null
+        def hasShadow = project.plugins.findPlugin('com.gradleup.shadow') != null || project.plugins.findPlugin('com.github.johnrengelman.shadow') != null
 
         createJmhSourceSet(project)
         final Configuration runtimeConfiguration = configureJmhRuntimeClasspathConfiguration(project, extension)

src/test/groovy/me/champeau/jmh/JMHPluginTest.groovy

@@ -118,8 +118,8 @@ class JMHPluginTest extends Specification {
 
         where:
         shadowPlugin << [
-                'com.github.johnrengelman.shadow',
-                'io.github.goooler.shadow'
+                'com.gradleup.shadow',
+                'com.github.johnrengelman.shadow'
         ]
     }