Merge branch 'master' into dependabot/gradle/test-project-groovy/org.spockframework-spock-core-2.4-groovy-5.0

Author: big-andy-coates

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Git checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6.0.2
     - name: Set up JDK 17
       uses: actions/setup-java@v5
       with:

.github/workflows/publish.yml

@@ -22,7 +22,7 @@ jobs:
       GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
     steps:
     - name: Git checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6.0.2
     - name: Set up JDK 17
       uses: actions/setup-java@v5
       with:
@@ -40,8 +40,8 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.0.0
+      - uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v3.0.0
       - name: Create GitHut Release
-        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v0.1.15
+        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v0.1.15
         with:
           generate_release_notes: true

build.gradle

@@ -1,10 +1,12 @@
+import org.gradle.api.attributes.java.TargetJvmVersion
+
 plugins {
     id 'eclipse'
     id 'java-gradle-plugin'
     id 'maven-publish' // used for publishing to local maven repository
-    id 'com.gradle.plugin-publish' version '2.0.0'
-    id 'com.gradleup.shadow' version '9.2.2'
-    id 'com.github.ben-manes.versions' version '0.53.0'
+    id 'com.gradle.plugin-publish' version '2.1.1'
+    id 'com.gradleup.shadow' version '9.4.1'
+    id 'com.github.ben-manes.versions' version '0.54.0'
 }
 
 develocity {
@@ -31,12 +33,12 @@ configurations {
     compile.extendsFrom plugin
 }
 
-def jUnitVersion = '5.14.0'
+def jUnitVersion = '6.0.1'
 
 dependencies {
     implementation gradleApi()
     implementation 'org.jooq:joor:0.9.15'
-    plugin 'com.github.javaparser:javaparser-symbol-solver-core:3.27.1'
+    plugin 'com.github.javaparser:javaparser-symbol-solver-core:3.28.0'
 
     testImplementation gradleTestKit()
     testImplementation 'com.google.guava:guava-base:r03'
@@ -72,7 +74,21 @@ configurations {
     }
 }
 
+configurations.testCompileClasspath {
+    attributes {
+        attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
+    }
+}
+configurations.testRuntimeClasspath {
+    attributes {
+        attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
+    }
+}
+
 test {
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
     useJUnitPlatform()
 
     testLogging {

settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.develocity" version "4.2.2"
+    id "com.gradle.develocity" version "4.4.1"
 }
 
 rootProject.name = 'moduleplugin'