Merge pull request #261 from jjohannes/fix-229

Do not access 'project.zipTree' in mapping closure
melix · Dec 13, 2023 · 2c29b07 · 2c29b07
2 parents 0d1e7a8 + b1356df
commit 2c29b07
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/funcTest/groovy/me/champeau/jmh/AbstractFuncSpec.groovy b/src/funcTest/groovy/me/champeau/jmh/AbstractFuncSpec.groovy
@@ -26,6 +26,7 @@ abstract class AbstractFuncSpec extends Specification {
 
     protected static final List<GradleVersion> TESTED_GRADLE_VERSIONS = [
             GradleVersion.version('7.0'),
+            GradleVersion.version('8.0'),
             GradleVersion.current()
     ]
 

diff --git a/src/funcTest/groovy/me/champeau/jmh/ParameterSpec.groovy b/src/funcTest/groovy/me/champeau/jmh/ParameterSpec.groovy
@@ -15,7 +15,7 @@
  */
 package me.champeau.jmh
 
-import org.gradle.util.GradleVersion
+
 import spock.lang.Unroll
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
@@ -39,15 +39,15 @@ class ParameterSpec extends AbstractFuncSpec {
 
     def "executes with configuration cache"() {
         given:
-        usingGradleVersion(GradleVersion.version("7.6"))
         usingSample("java-project")
 
         when:
         def result = build("jmhJar", "--configuration-cache")
 
         then:
         result.task(":jmhJar").outcome == SUCCESS
-        result.output.contains("Calculating task graph as no configuration cache is available for tasks: jmhJar")
+        result.output.contains("Calculating task graph as no configuration cache is available for tasks: jmhJar") ||
+                result.output.contains("Calculating task graph as no cached configuration is available for tasks: jmhJar")
 
         when:
         result = build("jmhJar", "--configuration-cache")

diff --git a/src/funcTest/groovy/me/champeau/jmh/UnsupportedGradleVersionSpec.groovy b/src/funcTest/groovy/me/champeau/jmh/UnsupportedGradleVersionSpec.groovy
@@ -15,7 +15,7 @@
  */
 package me.champeau.jmh
 
-import org.gradle.testkit.runner.TaskOutcome
+
 import org.gradle.util.GradleVersion
 import spock.lang.Unroll
 
@@ -32,7 +32,7 @@ class UnsupportedGradleVersionSpec extends AbstractFuncSpec {
         def result = buildAndFail("jmh")
 
         then:
-	result.output.contains('Please upgrade Gradle or use an older version of the JMH Gradle plugin.')
+	    result.output.contains('Please upgrade Gradle or use an older version of the JMH Gradle plugin.')
 
         where:
         gradleVersion << GradleVersion.version('6.9')

diff --git a/src/main/groovy/me/champeau/jmh/JMHPlugin.groovy b/src/main/groovy/me/champeau/jmh/JMHPlugin.groovy
@@ -20,6 +20,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.dsl.DependencyHandler
+import org.gradle.api.file.ArchiveOperations
 import org.gradle.api.file.Directory
 import org.gradle.api.file.FileCollection
 import org.gradle.api.file.FileCopyDetails
@@ -35,6 +36,8 @@ import org.gradle.plugins.ide.eclipse.EclipseWtpPlugin
 import org.gradle.plugins.ide.idea.IdeaPlugin
 import org.gradle.util.GradleVersion
 
+import javax.inject.Inject
+
 /**
  * Configures the JMH Plugin.
  */
@@ -265,6 +268,7 @@ class JMHPlugin implements Plugin<Project> {
                                                    Provider<Directory> jmhGeneratedClassesDir,
                                                    Configuration runtimeConfiguration) {
         project.tasks.register(JMH_JAR_TASK_NAME, Jar) {
+            def archives = project.objects.newInstance(ServiceInjection).archiveOperations
             it.group = JMH_GROUP
             it.dependsOn JMH_TASK_COMPILE_GENERATED_CLASSES_NAME
             it.inputs.files project.sourceSets.jmh.output
@@ -277,7 +281,7 @@ class JMHPlugin implements Plugin<Project> {
                 it.collect { it.asFile }
                         .findAll { it.directory || it.name.toLowerCase().endsWith('.jar') }
                         .collect {
-                            it.directory ? it : project.zipTree(it)
+                            it.directory ? it : archives.zipTree(it)
                         } as Set
             }).exclude(metaInfExcludes)
             def jmhSourceSetOutput = project.sourceSets.jmh.output
@@ -329,4 +333,9 @@ class JMHPlugin implements Plugin<Project> {
         }
         newConfig
     }
+
+    interface ServiceInjection {
+        @Inject
+        ArchiveOperations getArchiveOperations()
+    }
 }