Skip to content

Commit 6a4fa5c

Browse files
nedtwiggnedtwigg
authored
Bump build (#30)
2 parents f1b1e63 + 8e17d52 commit 6a4fa5c

File tree

9 files changed

+53
-40
lines changed

9 files changed

+53
-40
lines changed

Diff for: ‎.github/workflows/ci.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,19 @@ jobs:
1313
jre: [17]
1414
os: [ubuntu-latest, windows-latest]
1515
include:
16-
- jre: 11
16+
- jre: 21
1717
os: ubuntu-latest
1818
runs-on: ${{ matrix.os }}
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222
- name: Install JDK ${{ matrix.jre }}
23-
uses: actions/setup-java@v3
23+
uses: actions/setup-java@v4
2424
with:
2525
distribution: "temurin"
2626
java-version: ${{ matrix.jre }}
2727
- name: gradle caching
28-
uses: gradle/gradle-build-action@v2
29-
with:
30-
gradle-home-cache-cleanup: true
28+
uses: gradle/actions/setup-gradle@v4
3129
- name: git fetch origin main
3230
run: git fetch origin main
3331
- name: gradlew build
@@ -37,10 +35,10 @@ jobs:
3735
Xvfb :99 &
3836
export DISPLAY=:99
3937
fi
40-
./gradlew build
38+
./gradlew build --no-configuration-cache
4139
shell: bash
4240
- name: junit result
43-
uses: mikepenz/action-junit-report@v3
41+
uses: mikepenz/action-junit-report@v4
4442
if: always() # always run even if the previous step fails
4543
with:
4644
check_name: JUnit ${{ matrix.jre }} ${{ matrix.os }}

Diff for: ‎.github/workflows/deploy.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,14 @@ jobs:
3030
ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
3131
ORG_GRADLE_PROJECT_gpg_key64: ${{ secrets.GPG_KEY64 }}
3232
steps:
33-
- uses: actions/checkout@v3
34-
- name: jdk 11
35-
uses: actions/setup-java@v3
33+
- uses: actions/checkout@v4
34+
- name: jdk 17
35+
uses: actions/setup-java@v4
3636
with:
37-
java-version: 11
37+
java-version: 17
3838
distribution: 'temurin'
3939
- name: gradle caching
40-
uses: gradle/gradle-build-action@v2
41-
with:
42-
gradle-home-cache-cleanup: true
40+
uses: gradle/actions/setup-gradle@v4
4341
- name: git fetch origin main
4442
run: git fetch origin main
4543
- name: publish all

Diff for: ‎CHANGES.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# DurianSwt releases
22

33
## [Unreleased]
4+
### Changed
5+
- Bump required java from 11 to 17.
46

57
## [4.3.1] - 2024-07-05
68
### Changed

Diff for: ‎gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ maven_desc=DurianSwt - Reactive utilities and fluent builders for SWT
55
osgi_symbolic_name=com.diffplug.durian.swt
66
osgi_export=com.diffplug.common.swt.*
77

8-
ver_java=8
9-
kotlin_jvmTarget=1.8
8+
ver_java=17
9+
kotlin_jvmTarget=17
1010

1111
# Build requirements
1212
VER_FINDBUGS=3.0.1

Diff for: ‎gradle/wrapper/gradle-wrapper.jar

2.2 KB
Binary file not shown.

Diff for: ‎gradle/wrapper/gradle-wrapper.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

Diff for: ‎gradlew

+18-7
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
9087

9188
# Use the maximum available, or set MAX_FD != -1 to use that value.
9289
MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
143140
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144141
case $MAX_FD in #(
145142
max*)
143+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
144+
# shellcheck disable=SC3045
146145
MAX_FD=$( ulimit -H -n ) ||
147146
warn "Could not query maximum file descriptor limit"
148147
esac
149148
case $MAX_FD in #(
150149
'' | soft) :;; #(
151150
*)
151+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
152+
# shellcheck disable=SC3045
152153
ulimit -n "$MAX_FD" ||
153154
warn "Could not set maximum file descriptor limit to $MAX_FD"
154155
esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
193194
done
194195
fi
195196

197+
198+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
199+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
200+
196201
# Collect all arguments for the java command;
197202
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198203
# shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
205210
org.gradle.wrapper.GradleWrapperMain \
206211
"$@"
207212

213+
# Stop when "xargs" is not available.
214+
if ! command -v xargs >/dev/null 2>&1
215+
then
216+
die "xargs is not available"
217+
fi
218+
208219
# Use "xargs" to parse quoted args.
209220
#
210221
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

Diff for: ‎gradlew.bat

+9-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%" == "" @echo off
17+
@if "%DEBUG%"=="" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
28+
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4041

4142
set JAVA_EXE=java.exe
4243
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
44+
if %ERRORLEVEL% equ 0 goto execute
4445

4546
echo.
4647
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
7576

7677
:end
7778
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
79+
if %ERRORLEVEL% equ 0 goto mainEnd
7980

8081
:fail
8182
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8283
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
84+
set EXIT_CODE=%ERRORLEVEL%
85+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87+
exit /b %EXIT_CODE%
8588

8689
:mainEnd
8790
if "%OS%"=="Windows_NT" endlocal

Diff for: ‎settings.gradle

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@ plugins {
88
// https://github.com/diffplug/blowdryer/blob/main/CHANGELOG.md
99
id 'com.diffplug.blowdryerSetup' version '1.7.1'
1010
// https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md
11-
id 'com.diffplug.spotless' version '7.0.0.BETA1' apply false
11+
id 'com.diffplug.spotless' version '7.0.0.BETA4' apply false
1212
// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
13-
id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
13+
id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
1414
// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
15-
id 'com.gradle.plugin-publish' version '1.2.1' apply false
15+
id 'com.gradle.plugin-publish' version '1.3.0' apply false
1616
// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
17-
id 'dev.equo.ide' version '1.7.6' apply false
17+
id 'dev.equo.ide' version '1.7.7' apply false
1818
// https://github.com/gradle-nexus/publish-plugin/releases
1919
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
2020
// https://plugins.gradle.org/plugin/org.jetbrains.dokka
2121
id 'org.jetbrains.dokka' version '1.9.20' apply false
2222
// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
23-
id 'org.jetbrains.kotlin.jvm' version '2.0.0' apply false
23+
id 'org.jetbrains.kotlin.jvm' version '2.1.0' apply false
2424
// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.plugin.serialization
25-
id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.0' apply false
25+
id 'org.jetbrains.kotlin.plugin.serialization' version '2.1.0' apply false
2626
// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.multiplatform
27-
id 'org.jetbrains.kotlin.multiplatform' version '2.0.0' apply false
27+
id 'org.jetbrains.kotlin.multiplatform' version '2.1.0' apply false
2828
// https://github.com/adamko-dev/dokkatoo/releases
29-
id 'dev.adamko.dokkatoo-html' version '2.3.1' apply false
29+
id 'dev.adamko.dokkatoo-html' version '2.4.0' apply false
3030
}
3131
blowdryerSetup {
32-
github 'diffplug/blowdryer-diffplug', 'tag', '7.3.0'
32+
github 'diffplug/blowdryer-diffplug', 'tag', '8.0.3'
3333
//devLocal '../blowdryer-diffplug'
3434
setPluginsBlockTo {
3535
it.file 'plugin.versions'

0 commit comments

Comments
 (0)