Upgrade to Gradle 8.4 (#14)

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

@@ -8,7 +8,9 @@ on:
 jobs:
   build-and-publish:
     name: Java Gradle
-    uses: bakdata/ci-templates/.github/workflows/[email protected]
+    uses: bakdata/ci-templates/.github/workflows/[email protected]
+    with:
+      java-version: 17
     secrets:
       sonar-token: ${{ secrets.SONARCLOUD_TOKEN }}
       sonar-organization: ${{ secrets.SONARCLOUD_ORGANIZATION }}
@@ -17,7 +19,6 @@ jobs:
       signing-password: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
       ossrh-username: ${{ secrets.SONATYPE_OSSRH_USERNAME }}
       ossrh-password: ${{ secrets.SONATYPE_OSSRH_PASSWORD }}
-      github-username: ${{ secrets.GH_USERNAME }}
       github-token: ${{ secrets.GH_TOKEN }}
       gradle-publish-key: ${{ secrets.GRADLE_PLUGIN_PUBLISH_KEY }}
       gradle-publish-secret: ${{ secrets.GRADLE_PLUGIN_PUBLISH_SECRET }}

.github/workflows/release.yaml

@@ -16,8 +16,9 @@ on:
 jobs:
   java-gradle-release:
     name: Java Gradle
-    uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.42.0
+    uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.43.0
     with:
+      java-version: 17
       release-type: "${{ inputs.release-type }}"
     secrets:
       github-email: "${{ secrets.GH_EMAIL }}"

avro/src/test/kotlin/com/bakdata/gradle/AvroPluginTest.kt

@@ -27,6 +27,7 @@ package com.bakdata.gradle
 import org.assertj.core.api.Assertions
 import org.assertj.core.api.Condition
 import org.assertj.core.api.SoftAssertions
+import org.gradle.api.GradleException
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.artifacts.Configuration
@@ -62,7 +63,7 @@ internal class AvroPluginTest {
         SoftAssertions.assertSoftly { softly ->
             softly.assertThat(project.plugins.hasPlugin("com.github.davidmc24.gradle.plugin.avro"))
                 .isTrue
-            softly.assertThat(project.tasks)
+            softly.assertThat(project.collectTasks())
                 .haveExactly(1, taskWithName("configureCopyExternalAvroResources"))
                 .haveExactly(1, taskWithName("copyExternalAvroResources"))
                 .haveExactly(1, taskWithName("configureCopyTestExternalAvroResources"))
@@ -103,7 +104,7 @@ internal class AvroPluginTest {
         SoftAssertions.assertSoftly { softly ->
             softly.assertThat(project.plugins.hasPlugin("com.github.davidmc24.gradle.plugin.avro"))
                 .isTrue
-            softly.assertThat(project.tasks)
+            softly.assertThat(project.collectTasks())
                 .haveExactly(1, taskWithName("configureCopyExternalAvroResources"))
                 .haveExactly(1, taskWithName("copyExternalAvroResources"))
                 .haveExactly(1, taskWithName("configureCopyTestExternalAvroResources"))
@@ -142,4 +143,11 @@ internal class AvroPluginTest {
                 }
         }
     }
+
+    private fun Project.collectTasks(): List<Task> = try {
+        tasks.toList()
+    } catch (e: GradleException) {
+        // FIXME bug since Gradle 7.3 https://github.com/gradle/gradle/issues/20301
+        if (e.message.equals("Could not create task ':init'.")) tasks.toList() else throw e
+    }
 }

build.gradle.kts

@@ -1,10 +1,9 @@
 plugins {
     // release
-    id("net.researchgate.release") version "3.0.2"
+    id("com.bakdata.release") version "1.3.0"
     id("com.bakdata.sonar") version "1.1.17"
-    id("com.bakdata.sonatype") version "1.2.2"
-    id("org.hildan.github.changelog") version "1.13.1"
-    id("org.gradle.kotlin.kotlin-dsl") version "2.1.6" apply false
+    id("com.bakdata.sonatype") version "1.3.2"
+    id("org.gradle.kotlin.kotlin-dsl") version "4.1.2" apply false
     id("com.gradle.plugin-publish") version "1.2.1" apply false
 }
 
@@ -29,18 +28,13 @@ configure<com.bakdata.gradle.SonatypeSettings> {
     }
 }
 
-configure<org.hildan.github.changelog.plugin.GitHubChangelogExtension> {
-    githubUser = "bakdata"
-    futureVersionTag = findProperty("changelog.releaseVersion")?.toString()
-    sinceTag = findProperty("changelog.sinceTag")?.toString()
-}
-
 subprojects {
     apply(plugin = "java")
 
     configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(11)
+        }
     }
 
     apply(plugin = "java-gradle-plugin")
@@ -53,30 +47,24 @@ subprojects {
     // description is only ready after evaluation
     afterEvaluate {
         configure<GradlePluginDevelopmentExtension> {
+            website.set("https://github.com/bakdata/gradle-avro-dependency-plugin")
+            vcsUrl.set("https://github.com/bakdata/gradle-avro-dependency-plugin")
             plugins {
                 create("${project.name.capitalize()}Plugin") {
                     id = "com.bakdata.${project.name}"
                     implementationClass = "com.bakdata.gradle.${project.name.capitalize()}Plugin"
                     description = project.description
                     displayName = "Bakdata $name plugin"
+                    tags = listOf("bakdata", name)
                 }
             }
         }
-
-        extensions.findByType(com.gradle.publish.PluginBundleExtension::class)?.apply {
-            // actual block of plugin portal config, need to be done on each subproject as the plugin does not support multi-module projects yet...
-            website = "https://github.com/bakdata/gradle-avro-dependency-plugin"
-            vcsUrl = "https://github.com/bakdata/gradle-avro-dependency-plugin"
-            tags = listOf("bakdata", name)
-        }
     }
 
     dependencies {
-        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.7.2")
-        "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.7.2")
-        "testImplementation"("org.assertj", "assertj-core", "3.20.2")
+        val junitVersion = "5.10.2"
+        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
+        "testImplementation"("org.junit.jupiter:junit-jupiter-api:$junitVersion")
+        "testImplementation"("org.assertj", "assertj-core", "3.25.3")
     }
 }
-
-val sonarqube by tasks
-sonarqube.enabled = false //FIXME requires Java 17

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,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/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,11 +80,13 @@ do
     esac
 done
 
-# This is normally unused
-# shellcheck disable=SC2034
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
 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
+
+# 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,22 @@ 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
         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
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,28 +193,18 @@ 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" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle

@@ -1,7 +1,6 @@
 pluginManagement {
     repositories {
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
-        maven { url 'https://plugins.gradle.org/m2/' }
+        gradlePluginPortal()
     }
 }