Fix test and use Gradle 8.5 as baseline

melix · Dec 12, 2023 · 3be32a9 · 3be32a9
1 parent 2d6f14e
commit 3be32a9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 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
@@ -46,7 +46,8 @@ class ParameterSpec extends AbstractFuncSpec {
 
         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/main/groovy/me/champeau/jmh/JMHPlugin.groovy b/src/main/groovy/me/champeau/jmh/JMHPlugin.groovy
@@ -54,7 +54,7 @@ abstract class JMHPlugin implements Plugin<Project> {
     static final String JHM_RUNTIME_CLASSPATH_CONFIGURATION = 'jmhRuntimeClasspath'
 
     @Inject
-    protected abstract ArchiveOperations getArchives()
+    protected abstract ArchiveOperations getArchiveOperations()
 
     void apply(Project project) {
         assertMinimalGradleVersion()
@@ -271,7 +271,7 @@ abstract class JMHPlugin implements Plugin<Project> {
                                                    Provider<Directory> jmhGeneratedClassesDir,
                                                    Configuration runtimeConfiguration) {
         project.tasks.register(JMH_JAR_TASK_NAME, Jar) {
-            def archives = archives
+            def archives = archiveOperations
 
             it.group = JMH_GROUP
             it.dependsOn JMH_TASK_COMPILE_GENERATED_CLASSES_NAME