Bump build (#30)

Author: nedtwigg

.github/workflows/ci.yml

@@ -13,21 +13,19 @@ jobs:
         jre: [17]
         os: [ubuntu-latest, windows-latest]
         include:
-          - jre: 11
+          - jre: 21
             os: ubuntu-latest
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install JDK ${{ matrix.jre }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
       - name: gradle caching
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - name: git fetch origin main
         run: git fetch origin main
       - name: gradlew build
@@ -37,10 +35,10 @@ jobs:
             Xvfb :99 &
             export DISPLAY=:99
           fi
-          ./gradlew build
+          ./gradlew build --no-configuration-cache
         shell: bash
       - name: junit result
-        uses: mikepenz/action-junit-report@v3
+        uses: mikepenz/action-junit-report@v4
         if: always() # always run even if the previous step fails
         with:
           check_name: JUnit ${{ matrix.jre }} ${{ matrix.os }}

.github/workflows/deploy.yml

@@ -30,16 +30,14 @@ jobs:
       ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
       ORG_GRADLE_PROJECT_gpg_key64: ${{ secrets.GPG_KEY64 }}
     steps:
-      - uses: actions/checkout@v3
-      - name: jdk 11
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: jdk 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
       - name: gradle caching
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - name: git fetch origin main
         run: git fetch origin main
       - name: publish all

CHANGES.md

@@ -1,6 +1,8 @@
 # DurianSwt releases
 
 ## [Unreleased]
+### Changed
+- Bump required java from 11 to 17.
 
 ## [4.3.1] - 2024-07-05
 ### Changed

gradle.properties

@@ -5,8 +5,8 @@ maven_desc=DurianSwt - Reactive utilities and fluent builders for SWT
 osgi_symbolic_name=com.diffplug.durian.swt
 osgi_export=com.diffplug.common.swt.*
 
-ver_java=8
-kotlin_jvmTarget=1.8
+ver_java=17
+kotlin_jvmTarget=17
 
 # Build requirements
 VER_FINDBUGS=3.0.1

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/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,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# 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"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 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=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=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ 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, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         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

@@ -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,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+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%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew.bat

@@ -8,28 +8,28 @@ plugins {
 	// https://github.com/diffplug/blowdryer/blob/main/CHANGELOG.md
 	id 'com.diffplug.blowdryerSetup' version '1.7.1'
 	// https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md
-	id 'com.diffplug.spotless' version '7.0.0.BETA1' apply false
+	id 'com.diffplug.spotless' version '7.0.0.BETA4' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
-	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
+	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-	id 'com.gradle.plugin-publish' version '1.2.1' apply false
+	id 'com.gradle.plugin-publish' version '1.3.0' apply false
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide' version '1.7.6' apply false
+	id 'dev.equo.ide' version '1.7.7' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://plugins.gradle.org/plugin/org.jetbrains.dokka
 	id 'org.jetbrains.dokka'                       version '1.9.20' apply false
 	// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
-	id 'org.jetbrains.kotlin.jvm'                  version '2.0.0' apply false
+	id 'org.jetbrains.kotlin.jvm'                  version '2.1.0' apply false
 	// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.plugin.serialization
-	id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.0' apply false
+	id 'org.jetbrains.kotlin.plugin.serialization' version '2.1.0' apply false
 	// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.multiplatform
-	id 'org.jetbrains.kotlin.multiplatform' version '2.0.0' apply false
+	id 'org.jetbrains.kotlin.multiplatform' version '2.1.0' apply false
 	// https://github.com/adamko-dev/dokkatoo/releases
-	id 'dev.adamko.dokkatoo-html' version '2.3.1' apply false
+	id 'dev.adamko.dokkatoo-html' version '2.4.0' apply false
 }
 blowdryerSetup {
-	github 'diffplug/blowdryer-diffplug', 'tag', '7.3.0'
+	github 'diffplug/blowdryer-diffplug', 'tag', '8.0.3'
 	//devLocal '../blowdryer-diffplug'
 	setPluginsBlockTo {
 		it.file 'plugin.versions'