Merge branch 'master' into gradle-9

Author: Vampire

.github/actions/setup-build-env/action.yml

@@ -14,7 +14,7 @@ runs:
       with:
         additional-java-version: ${{ inputs.additional-java-version }}
     - name: Init Gradle Build Action
-      uses: gradle/actions/setup-gradle@v4
+      uses: gradle/actions/setup-gradle@v5
       with:
         cache-read-only: ${{ github.ref != 'refs/heads/master' }}
     - name: 'Gradle javaToolchains'

.github/actions/setup-jdks/action.yml

@@ -8,7 +8,7 @@ runs:
   using: "composite"
   steps:
     - name: 'Set up JDK ${{ inputs.additional-java-version }}'
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       if: inputs.additional-java-version != 8 && inputs.additional-java-version != 17
       with:
         distribution: 'temurin'
@@ -18,7 +18,7 @@ runs:
       run: echo "JDK${{ inputs.additional-java-version }}=$JAVA_HOME" >> $GITHUB_ENV
     # We need JDK to compile Spock Core
     - name: 'Set up JDK 8'
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         # Temurin JDK 8 for macos on ARM is not available: https://github.com/adoptium/adoptium/issues/96
         distribution: ${{ ((runner.os == 'macOS') && (runner.arch == 'ARM64')) && 'zulu' || 'temurin' }}
@@ -28,7 +28,7 @@ runs:
       run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
     # We need JDK 17 for the Gradle build logic
     - name: 'Set up JDK 17'
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: 17

.github/workflows/branches-and-prs.main.kts

@@ -20,7 +20,7 @@
 
 @file:Repository("https://repo.maven.apache.org/maven2/")
 // work-around for https://youtrack.jetbrains.com/issue/KT-69145
-@file:DependsOn("io.github.typesafegithub:github-workflows-kt:3.4.0")
+@file:DependsOn("io.github.typesafegithub:github-workflows-kt:3.5.0")
 
 @file:Repository("https://bindings.krzeminski.it/")
 @file:DependsOn("actions:checkout___major:[v4,v5-alpha)")

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

@@ -61,7 +61,7 @@ jobs:
         - '11'
         - '17'
         - '21'
-        - '23'
+        - '24'
         os:
         - 'ubuntu-latest'
         exclude:
@@ -72,7 +72,7 @@ jobs:
           java: '21'
           os: 'ubuntu-latest'
         - variant: '2.5'
-          java: '23'
+          java: '24'
           os: 'ubuntu-latest'
         include:
         - variant: '2.5'

.github/workflows/codeql-analysis.main.kts

@@ -20,7 +20,7 @@
 
 @file:Repository("https://repo.maven.apache.org/maven2/")
 // work-around for https://youtrack.jetbrains.com/issue/KT-69145
-@file:DependsOn("io.github.typesafegithub:github-workflows-kt:3.4.0")
+@file:DependsOn("io.github.typesafegithub:github-workflows-kt:3.5.0")
 
 @file:Repository("https://bindings.krzeminski.it/")
 @file:DependsOn("actions:checkout___major:[v4,v5-alpha)")

.github/workflows/common.main.kts

@@ -17,7 +17,7 @@
  */
 
 @file:Repository("https://repo.maven.apache.org/maven2/")
-@file:DependsOn("io.github.typesafegithub:github-workflows-kt:3.4.0")
+@file:DependsOn("io.github.typesafegithub:github-workflows-kt:3.5.0")
 
 import io.github.typesafegithub.workflows.domain.Job
 import io.github.typesafegithub.workflows.domain.JobOutputs.EMPTY
@@ -85,6 +85,7 @@ data class Matrix(
 
     data class Axes(
         val javaVersions: List<String>,
+        val additionalJavaTestVersions: List<String>,
         val variants: List<String>
     )
 
@@ -137,7 +138,7 @@ val Matrix.Companion.full
     get() = Matrix(
         operatingSystems = listOf("ubuntu-latest"),
         variants = axes.variants,
-        javaVersions = axes.javaVersions + "23",
+        javaVersions = axes.javaVersions + axes.additionalJavaTestVersions,
         exclude = { (variant == "2.5") && (javaVersion!!.toInt() >= 17) },
         includes = listOf("windows-latest", "macos-latest")
             .map {
@@ -159,13 +160,18 @@ val Matrix.Companion.axes by lazy {
 
         Matrix.Axes(
             properties.getList("javaVersionsList"),
+            properties.getList("additionalJavaTestVersionsList"),
             properties.getList("variantsList")
         )
     }
 }
 
 fun Properties.getList(key: String) =
-    getProperty(key).trim().split("""\s*+,\s*+""".toRegex())
+    getProperty(key)
+        ?.trim()
+        ?.split("""\s*+,\s*+""".toRegex())
+        ?.filter { it.isNotBlank() }
+        ?: emptyList()
 
 data class SetupBuildEnv(
     val additionalJavaVersion: String? = null

.github/workflows/docs-pr.main.kts

@@ -20,7 +20,7 @@
 
 @file:Repository("https://repo.maven.apache.org/maven2/")
 // work-around for https://youtrack.jetbrains.com/issue/KT-69145
-@file:DependsOn("io.github.typesafegithub:github-workflows-kt:3.4.0")
+@file:DependsOn("io.github.typesafegithub:github-workflows-kt:3.5.0")
 
 @file:Repository("https://bindings.krzeminski.it/")
 @file:DependsOn("actions:checkout___major:[v4,v5-alpha)")

.github/workflows/release.main.kts

@@ -20,7 +20,7 @@
 
 @file:Repository("https://repo.maven.apache.org/maven2/")
 // work-around for https://youtrack.jetbrains.com/issue/KT-69145
-@file:DependsOn("io.github.typesafegithub:github-workflows-kt:3.4.0")
+@file:DependsOn("io.github.typesafegithub:github-workflows-kt:3.5.0")
 
 @file:Repository("https://bindings.krzeminski.it/")
 @file:DependsOn("actions:checkout___major:[v4,v5-alpha)")

.github/workflows/release.yaml

@@ -41,7 +41,7 @@ jobs:
         - '11'
         - '17'
         - '21'
-        - '23'
+        - '24'
         os:
         - 'ubuntu-latest'
         exclude:
@@ -52,7 +52,7 @@ jobs:
           java: '21'
           os: 'ubuntu-latest'
         - variant: '2.5'
-          java: '23'
+          java: '24'
           os: 'ubuntu-latest'
         include:
         - variant: '2.5'

README.adoc

@@ -18,9 +18,9 @@ image::docs/images/spock-main-logo.png[width=100px,float=right]
 == Spock Framework
 
 Spock is a BDD-style developer testing and specification framework for
-Java and https://groovy-lang.org/[Groovy] applications.To learn more
+Java and https://groovy-lang.org/[Groovy] applications. To learn more
 about Spock, visit
-https://spockframework.org[https://spockframework.org].To run a sample
+https://spockframework.org[https://spockframework.org]. To run a sample
 spec in your browser use the
 https://groovyconsole.dev/[Groovy Web Console].
 
@@ -29,9 +29,9 @@ https://groovyconsole.dev/[Groovy Web Console].
 * The latest 2.x release version is *{spock-release-version}* ({spock-release-version}-groovy-2.5,
 {spock-release-version}-groovy-3.0, {spock-release-version}-groovy-4.0), released on {spock-release-date}.
 * The current development version is *{spock-snapshot-version}-SNAPSHOT*
-({spock-snapshot-version}-groovy-2.5-SNAPSHOT, {spock-snapshot-version}-groovy-3.0-SNAPSHOT, , {spock-snapshot-version}-groovy-4.0-SNAPSHOT).
+({spock-snapshot-version}-groovy-2.5-SNAPSHOT, {spock-snapshot-version}-groovy-3.0-SNAPSHOT, {spock-snapshot-version}-groovy-4.0-SNAPSHOT).
 
-*NOTE:* Spock 2.x is based on the JUnit 5 Platform and require Java
+*NOTE:* Spock 2.x is based on the JUnit 5 Platform and requires Java
 8+/groovy-2.5+ (Groovy 3.0 or 4.0 is recommended, especially in projects using
 Java 12+).
 
@@ -44,7 +44,7 @@ OSS].
 ==== Ad-Hoc Intermediate Releases
 
 For intermediate stable builds we recommend to use
-https://jitpack.io/#org.spockframework/spock[Jitpack] (go here for
+https://jitpack.io/#org.spockframework/spock[JitPack] (go here for
 instructions):
 
 . Add https://jitpack.io[https://jitpack.io] as a repository
@@ -117,13 +117,13 @@ To build a specific variant of Spock, use the variant name as a parameter
 ....
 
 To test against a specific Java version, use the java version name as a parameter, the path to the Java version must be set via an environment variable `JDK<version>=<PATH>`.
-Of course, this can combined with the variant selection from above.
+Of course, this can be combined with the variant selection from above.
 
 ....
 ./gradlew build -DjavaVersion=17
 ....
 
-(Windows: `gradlew build`). All build dependencies, including the
+(In `cmd.exe`: `gradlew build`). All build dependencies, including the
 https://www.gradle.org[build tool] itself, will be downloaded
 automatically (unless already present).
 
@@ -142,8 +142,8 @@ feedback is appreciated!
 === Java 9 Module Names
 
 All published jars (beginning with Spock 1.2) will contain
-Automatic-Module-Name manifest attribute. This allows for Spock to be
-used in a Java 9 Module Path.
+`Automatic-Module-Name` manifest attribute. This allows for Spock to be
+used in a Java 9+ Module Path.
 
 * spock-core -- `org.spockframework.core`
 * spock-spring -- `org.spockframework.spring`