Add Groovy 6 Alpha 1 as a testing variant

.github/codecov.yml

@@ -3,4 +3,4 @@ codecov:
 
 comment:
   layout: "reach, diff, flags, files"
-  after_n_builds: 24
+  after_n_builds: 29

.github/workflows/branches-and-prs.yaml

@@ -57,6 +57,7 @@ jobs:
         - '3.0'
         - '4.0'
         - '5.0'
+        - '6.0'
         java:
         - '8'
         - '11'
@@ -78,6 +79,12 @@ jobs:
         - variant: '5.0'
           java: '8'
           os: 'ubuntu-latest'
+        - variant: '6.0'
+          java: '8'
+          os: 'ubuntu-latest'
+        - variant: '6.0'
+          java: '11'
+          os: 'ubuntu-latest'
         include:
         - variant: '2.5'
           java: '8'
@@ -91,6 +98,9 @@ jobs:
         - variant: '5.0'
           java: '11'
           os: 'windows-latest'
+        - variant: '6.0'
+          java: '17'
+          os: 'windows-latest'
         - variant: '2.5'
           java: '8'
           os: 'macos-latest'
@@ -103,6 +113,9 @@ jobs:
         - variant: '5.0'
           java: '11'
           os: 'macos-latest'
+        - variant: '6.0'
+          java: '17'
+          os: 'macos-latest'
     steps:
     - id: 'step-0'
       name: 'Checkout Repository'

.github/workflows/common.main.kts

@@ -86,7 +86,8 @@ data class Matrix(
     data class Axes(
         val javaVersions: List<String>,
         val additionalJavaTestVersions: List<String>,
-        val variants: List<String>
+        val variants: List<String>,
+        val additionalVariants: List<String>
     )
 
     data class Element(
@@ -137,19 +138,27 @@ fun WorkflowBuilder.job(
 val Matrix.Companion.full
     get() = Matrix(
         operatingSystems = listOf("ubuntu-latest"),
-        variants = axes.variants,
+        variants = axes.variants + axes.additionalVariants,
         javaVersions = axes.javaVersions + axes.additionalJavaTestVersions,
         exclude = {
-            ((variant == "2.5") && (javaVersion!!.toInt() >= 17)) ||
-                ((variant == "5.0") && (javaVersion!!.toInt() < 11))
+            when (variant) {
+                "2.5" -> javaVersion!!.toInt() >= 17
+                "5.0" -> javaVersion!!.toInt() < 11
+                "6.0" -> javaVersion!!.toInt() < 17
+                else -> false
+            }
         },
         includes = listOf("windows-latest", "macos-latest")
             .map { Matrix.Element(operatingSystem = it) }
             .flatMap { element ->
-                axes.variants.map {
+                (axes.variants + axes.additionalVariants).map {
                     element.copy(
                         variant = it,
-                        javaVersion = if (it == "5.0") "11" else axes.javaVersions.first()
+                        javaVersion = when (it) {
+                            "5.0" -> "11"
+                            "6.0" -> "17"
+                            else -> axes.javaVersions.first()
+                        }
                     )
                 }
             }
@@ -166,7 +175,8 @@ val Matrix.Companion.axes by lazy {
         Matrix.Axes(
             properties.getList("javaVersionsList"),
             properties.getList("additionalJavaTestVersionsList"),
-            properties.getList("variantsList")
+            properties.getList("variantsList"),
+            properties.getList("additionalVariantsList")
         )
     }
 }

.github/workflows/release.yaml

@@ -37,6 +37,7 @@ jobs:
         - '3.0'
         - '4.0'
         - '5.0'
+        - '6.0'
         java:
         - '8'
         - '11'
@@ -58,6 +59,12 @@ jobs:
         - variant: '5.0'
           java: '8'
           os: 'ubuntu-latest'
+        - variant: '6.0'
+          java: '8'
+          os: 'ubuntu-latest'
+        - variant: '6.0'
+          java: '11'
+          os: 'ubuntu-latest'
         include:
         - variant: '2.5'
           java: '8'
@@ -71,6 +78,9 @@ jobs:
         - variant: '5.0'
           java: '11'
           os: 'windows-latest'
+        - variant: '6.0'
+          java: '17'
+          os: 'windows-latest'
         - variant: '2.5'
           java: '8'
           os: 'macos-latest'
@@ -83,6 +93,9 @@ jobs:
         - variant: '5.0'
           java: '11'
           os: 'macos-latest'
+        - variant: '6.0'
+          java: '17'
+          os: 'macos-latest'
     steps:
     - id: 'step-0'
       name: 'Checkout Repository'

allVariants

@@ -1,4 +1,4 @@
 #!/bin/sh
-for var in 2.5 3.0 4.0 5.0; do
+for var in 2.5 3.0 4.0 5.0 6.0; do
     ./gradlew -Dvariant="$var" "$@"
 done

allVariants.bat

@@ -1,4 +1,4 @@
 @echo off
-for %%v in (2.5 3.0 4.0 5.0) do (
+for %%v in (2.5 3.0 4.0 5.0 6.0) do (
     gradlew.bat -Dvariant=%%v %*
 )

build-logic/base/src/main/groovy/org/spockframework/gradle/SpockBasePlugin.groovy

@@ -39,7 +39,7 @@ import java.time.Duration
 class SpockBasePlugin implements Plugin<Project> {
 
   @VisibleForTesting
-  public static final JavaLanguageVersion COMPILER_VERSION = JavaLanguageVersion.of(11)
+  public static final JavaLanguageVersion COMPILER_VERSION = JavaLanguageVersion.of(17)
   public static final int COMPILER_RELEASE_VERSION = 8
 
   void apply(Project project) {

build.gradle

@@ -53,6 +53,17 @@ ext {
       }
       javaVersion = 11
     }
+  } else if (variant == 6.0) {
+    groovyGroup = "org.apache.groovy"
+    groovyVersion = libs.versions.groovy6.get()
+    minGroovyVersion = "6.0.0"
+    maxGroovyVersion = "6.9.99"
+    if (javaVersion < 17) {
+      if (System.getProperty("javaVersion") != null) {
+        throw new InvalidUserDataException("Groovy $variant is not compatible with Java $javaVersion")
+      }
+      javaVersion = 17
+    }
   } else {
     throw new InvalidUserDataException("Unknown variant: $variant. Choose one of: $variants")
   }
@@ -238,8 +249,8 @@ if (gradle.startParameter.taskNames == ["ghActionsPublish"] || gradle.startParam
   }
 
   if (originalStartParameterTaskNames == ["ghActionsPublish"]) {
-    if ((javaVersion != javaVersions.min()) && ((variant != 5.0) || (javaVersion != 11))) {
-      throw new IllegalArgumentException("ghActionsPublish can only be run on Java ${javaVersions.min()} (or 11 for variant 5.0) but was run on $javaVersion")
+    if ((javaVersion != javaVersions.min()) && ((variant != 5.0) || (javaVersion != 11)) && ((variant != 6.0) || (javaVersion != 17))) {
+      throw new IllegalArgumentException("ghActionsPublish can only be run on Java ${javaVersions.min()} (or 11 for variant 5.0, 17 for variant 6.0) but was run on $javaVersion")
     }
     /*
       We want to release only snapshots directly from master, final releases will be tagged and then published from that tag.

gradle.properties

@@ -23,4 +23,5 @@ org.gradle.caching=true
 javaVersionsList=8, 11, 17, 21, 25
 additionalJavaTestVersionsList=
 variantsList=2.5, 3.0, 4.0, 5.0
+additionalVariantsList=6.0
 kotlin.code.style=official

gradle/libs.versions.toml

@@ -4,6 +4,7 @@ groovy2 = '2.5.23'
 groovy3 = '3.0.25'
 groovy4 = '4.0.32'
 groovy5 = '5.0.6'
+groovy6 = '6.0.0-alpha-1'
 jacoco = '0.8.14'
 junit5 = '5.14.4'
 junit6 = '6.1.0'
@@ -50,3 +51,4 @@ groovy-v2 = { module = "org.codehaus.groovy:groovy", version.ref="groovy2" }
 groovy-v3 = { module = "org.codehaus.groovy:groovy", version.ref="groovy3" }
 groovy-v4 = { module = "org.apache.groovy:groovy", version.ref="groovy4" }
 groovy-v5 = { module = "org.apache.groovy:groovy", version.ref="groovy5" }
+groovy-v6 = { module = "org.apache.groovy:groovy", version.ref="groovy6" }