diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index f08a5909..46195c5c 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -12,14 +12,14 @@ jobs: matrix: os: [windows-2022, ubuntu-22.04, ubuntu-22.04-arm, macos-15-intel, macos-14] steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: - submodules: true - - name: Set up JDK 22.0.2 + submodules: recursive + - name: Set up JDK 25.0.2 uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '22.0.2' + java-version: '25.0.2' - name: Show Build Versions run: ./gradlew -v - name: Build with Gradle @@ -44,7 +44,7 @@ jobs: if: ${{ runner.os == 'Linux' }} run: ./repackage.sh - name: Upload Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: Sparrow Build - ${{ runner.os }} ${{ runner.arch }} path: | @@ -62,7 +62,7 @@ jobs: run: ./repackage.sh - name: Upload Headless Artifact if: ${{ runner.os == 'Linux' }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: Sparrow Build - ${{ runner.os }} ${{ runner.arch }} Headless path: | diff --git a/build.gradle b/build.gradle index 64edeb8f..cf1a50bc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'application' id 'org-openjfx-javafxplugin' - id 'org.beryx.jlink' version '3.2.1-beta' + id 'org.beryx.jlink' version '3.2.1' id 'org.gradlex.extra-java-module-info' version '1.13.1' id 'io.matthewnelson.kmp.tor.resource-filterjar' version '408.16.3' } @@ -32,7 +32,7 @@ tasks.withType(AbstractArchiveTask).configureEach { } javafx { - version = headless ? "18" : "23.0.2" + version = headless ? "18" : "25.0.2" modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.graphics' ] } @@ -110,7 +110,7 @@ dependencies { implementation('com.github.hervegirod:fxsvgimage:1.1') implementation('com.sparrowwallet:toucan:0.9.0') implementation('com.jcraft:jzlib:1.1.3') - implementation('io.github.doblon8:jzbar:0.2.1') + implementation('io.github.doblon8:jzbar:0.3.0') testImplementation('org.junit.jupiter:junit-jupiter-api:5.10.0') testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.10.0') testRuntimeOnly('org.junit.platform:junit-platform-launcher')