Update the project to Gradle 8.13

Author: DavidGregory084

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ equalsVerifier = "3.19.4"
 graalVmNativeImagePlugin = "0.10.1"
 gradleBuildInfo = "0.3.1"
 gradleJavaConventions = "0.2.0"
-gradleToolingApi = "8.6"
+gradleToolingApi = "8.13"
 hamcrest = "2.2"
 jacoco = "0.8.8"
 jsonJava = "20240303"

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -203,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -68,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -1,12 +1,11 @@
 /*
- * SPDX-FileCopyrightText:  © 2023 Opencast Software Europe Ltd <https://opencastsoftware.com>
+ * SPDX-FileCopyrightText:  © 2023-2025 Opencast Software Europe Ltd <https://opencastsoftware.com>
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.opencastsoftware.gradle.bsp;
 
 import com.opencastsoftware.gradle.bsp.model.*;
 import org.gradle.api.Project;
-import org.gradle.api.attributes.TestSuiteType;
 import org.gradle.api.plugins.ApplicationPlugin;
 import org.gradle.api.plugins.JavaLibraryPlugin;
 import org.gradle.api.plugins.jvm.JvmTestSuite;
@@ -72,18 +71,12 @@ protected List<String> getBuildTargetTagsFor(Project project, SourceSet sourceSe
         }
 
         var testSourceSets = getTestSourceSets(project);
-        var integrationTestSourceSets = getTestSourceSetsWithType(project, TestSuiteType.INTEGRATION_TEST);
-
         var isTest = testSourceSets.contains(sourceSet);
+
         if (isTest) {
             tags.add(TEST_TAG);
         }
 
-        var isIntegrationTest = integrationTestSourceSets.contains(sourceSet);
-        if (isIntegrationTest) {
-            tags.add(INTEGRATION_TEST_TAG);
-        }
-
         return tags;
     }
 
@@ -127,16 +120,4 @@ protected Set<SourceSet> getTestSourceSets(Project project) {
                         .collect(Collectors.toSet()))
                 .orElse(Set.of());
     }
-
-    protected Set<SourceSet> getTestSourceSetsWithType(Project project, String testSuiteType) {
-        var testingExtension = project.getExtensions().findByType(TestingExtension.class);
-
-        return Optional.ofNullable(testingExtension)
-                .map(ext -> ext.getSuites()
-                        .withType(JvmTestSuite.class).stream()
-                        .filter(suite -> suite.getTestType().get().equals(testSuiteType))
-                        .map(JvmTestSuite::getSources)
-                        .collect(Collectors.toSet()))
-                .orElse(Set.of());
-    }
 }

model/settings.gradle.kts

@@ -9,7 +9,7 @@
         "gradle",
         "org.gradle:gradle-tooling-api"
       ],
-      "allowedVersions": "<8.7"
+      "allowedVersions": "<8.14"
     }
   ]
 }