Upgrade to Gradle 8.4

.github/workflows/build-and-publish.yaml

@@ -9,6 +9,8 @@ jobs:
   build-and-publish:
     name: Java Gradle
     uses: bakdata/ci-templates/.github/workflows/[email protected]
+    with:
+      java-version: 17
     secrets:
       sonar-token: ${{ secrets.SONARCLOUD_TOKEN }}
       sonar-organization: ${{ secrets.SONARCLOUD_ORGANIZATION }}

.github/workflows/release.yaml

@@ -18,6 +18,7 @@ jobs:
     name: Java Gradle
     uses: bakdata/ci-templates/.github/workflows/[email protected]
     with:
+      java-version: 17
       release-type: "${{ inputs.release-type }}"
 
     secrets:

build.gradle.kts

@@ -1,17 +1,17 @@
 buildscript {
     dependencies {
-        classpath("org.gradle.kotlin:plugins:1.3.3")
-        classpath("com.gradle.publish:plugin-publish-plugin:0.11.0")
+        classpath("org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.3.0")
+        classpath("com.gradle.publish:plugin-publish-plugin:1.2.1")
     }
 }
 
 plugins {
     // release
-    id("net.researchgate.release") version "2.6.0"
+    id("net.researchgate.release") version "3.0.2"
     // eat your own dog food - apply the plugins to this plugin project
-    id("com.bakdata.sonar") version "1.1.14"
+    id("com.bakdata.sonar") version "1.1.17"
     id("com.bakdata.sonatype") version "1.1.14"
-    id("org.hildan.github.changelog") version "0.8.0"
+    id("org.hildan.github.changelog") version "2.2.0"
 }
 
 allprojects {
@@ -52,6 +52,12 @@ configure<org.hildan.github.changelog.plugin.GitHubChangelogExtension> {
 subprojects {
     apply(plugin = "java")
 
+    configure<JavaPluginExtension> {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(11)
+        }
+    }
+
     dependencies {
         "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.3.0")
         "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.3.0")
@@ -76,24 +82,23 @@ if (!version.toString().endsWith("-SNAPSHOT")) {
                             id = "com.bakdata.${project.name}"
                             implementationClass = "com.bakdata.gradle.${project.name.capitalize()}Plugin"
                             description = project.description
+                            displayName = "Bakdata $name plugin"
                         }
                     }
                 }
                 // actual block of plugin portal config, need to be done on each subproject as the plugin does not support multi-module projects yet...
                 configure<com.gradle.publish.PluginBundleExtension> {
                     website = "https://github.com/bakdata/gradle-plugins"
                     vcsUrl = "https://github.com/bakdata/gradle-plugins"
-                    (plugins) {
-                        "${name.capitalize()}Plugin" {
-                            displayName = "Bakdata $name plugin"
-                            tags = listOf("bakdata", name)
-                        }
-                    }
+                    tags = listOf("bakdata", name)
                 }
             }
         }
     }
 }
 
-val sonarqube by tasks
-sonarqube.enabled = false //FIXME requires Java 17
+release {
+    git {
+        requireBranch.set("master")
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,8 +83,10 @@ done
 # This is normally unused
 # 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 "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -131,29 +133,26 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,15 +197,11 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-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,
-#     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.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

sonar/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     kotlin("jvm")
-    id("org.jetbrains.dokka") version "0.9.17"
+    id("org.jetbrains.dokka") version "1.9.10"
 }
 apply(plugin = "org.gradle.kotlin.kotlin-dsl")
 

sonatype/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     kotlin("jvm")
-    id("org.jetbrains.dokka") version "0.9.17"
+    id("org.jetbrains.dokka") version "1.9.10"
 }
 apply(plugin = "org.gradle.kotlin.kotlin-dsl")