diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 42fa09f..e32c31e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,10 +23,10 @@ jobs: if: ${{ matrix.os == 'ubuntu-latest' }} run: sudo apt-get install -y fuse libfuse2 - - name: Setup JDK 21 + - name: Setup JDK 22 uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '22' distribution: 'temurin' - name: Setup Gradle diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b481867..ac81ed3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,10 +23,10 @@ jobs: if: ${{ matrix.os == 'ubuntu-latest' }} run: sudo apt-get install -y fuse libfuse2 - - name: Setup JDK 21 + - name: Setup JDK 22 uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '22' distribution: 'temurin' - name: Setup Gradle diff --git a/build.gradle b/build.gradle index d5e25a6..69d1732 100644 --- a/build.gradle +++ b/build.gradle @@ -15,8 +15,8 @@ version '1.3.1' def currentOS = DefaultNativePlatform.currentOperatingSystem java { - targetCompatibility = JavaVersion.VERSION_21 - sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_22 + sourceCompatibility = JavaVersion.VERSION_22 } application { @@ -25,7 +25,7 @@ application { } javafx { - version = '22' + version = '22.0.1' configuration = 'implementation' modules = ['javafx.base', 'javafx.controls', 'javafx.fxml', 'javafx.media'] } @@ -142,9 +142,9 @@ repositories { dependencies { implementation 'org.apache.logging.log4j:log4j-core:2.23.1' implementation 'io.github.mkpaz:atlantafx-base:2.0.1' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3' } tasks.named('test') { diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 0000000..ef4314f --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,2 @@ +#This file is generated by updateDaemonJvm +toolchainVersion=22 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..2c35211 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..09523c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -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,8 @@ 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 +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -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 ##########################################################################