.github/workflows/main.yml

@@ -13,15 +13,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'zulu'
       - name: Install Linux dependencies
         run: sudo apt-get install libplist-dev libimobiledevice-dev libirecovery-1.0-dev
         if: runner.os == 'Linux'
       - name: Gradle build
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: build --no-daemon --scan
           dependency-graph: generate-and-submit
@@ -32,7 +32,7 @@ jobs:
           path: build/distributions/*
       - name: Upload reports on failure
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: failure-${{ runner.os }}
           path: build/reports/
@@ -43,7 +43,7 @@ jobs:
     if: "startsWith(github.event.head_commit.message, 'Release')"
     steps:
       - name: Get artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
       - name: Get version from commit
         run: echo "VERSION=$(echo ${{ github.event.commits[0].message }} | awk '{print $2}')" >> $GITHUB_ENV
       - name: Release public builds

build.gradle

@@ -21,8 +21,8 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 
 plugins {
     id 'application'
-    id 'com.github.ben-manes.versions' version '0.49.0'
-    id 'org.beryx.jlink' version '3.0.0'
+    id 'com.github.ben-manes.versions' version '0.51.0'
+    id 'org.beryx.jlink' version '3.0.1'
     id 'org.openjfx.javafxplugin' version '0.1.0'
 
     id 'idea'
@@ -32,7 +32,7 @@ idea.module.outputDir file('out/production/classes') // fix running via IntelliJ
 /*
  * REMEMBER: also update the version string in Main.java
  */
-version = '3.5.2'
+version = '3.6.0'
 description = 'A cross-platform GUI and CLI app for saving SHSH blobs'
 String appIdentifier = 'airsquared.blobsaver.app'
 String copyright = 'Copyright (c) 2023 airsquared'
@@ -41,7 +41,6 @@ var os = DefaultNativePlatform.currentOperatingSystem
 startScripts.enabled = distZip.enabled = distTar.enabled = false
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
-tasks.withType(JavaCompile).forEach {it.options.compilerArgs.add '--enable-preview' }
 
 repositories {
     mavenCentral()
@@ -52,30 +51,30 @@ dependencies {
     implementation ('de.jangassen:nsmenufx:3.1.0') {
         exclude group: 'net.java.dev.jna', module: 'jna' //different jna version
     }
-    implementation 'net.java.dev.jna:jna-jpms:5.13.0'
-    implementation 'org.apache.commons:commons-compress:1.24.0'
+    implementation 'net.java.dev.jna:jna-jpms:5.14.0'
+    implementation 'org.apache.commons:commons-compress:1.26.0'
     implementation 'info.picocli:picocli:4.7.5'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-    testImplementation 'org.testfx:openjfx-monocle:jdk-12.0.1+2'
+    testImplementation 'org.testfx:openjfx-monocle:21.0.2'
 }
 
 javafx {
-    version = '21.0.1'
+    version = '21.0.2'
     modules = [ 'javafx.controls', 'javafx.fxml' ]
 }
 
-var addExports = '--add-exports=javafx.graphics/com.sun.javafx.css=airsquared.blobsaver'
+var addJvmArgs = ['--enable-preview', '--add-exports=javafx.graphics/com.sun.javafx.css=airsquared.blobsaver']
 
-compileJava {
-    options.compilerArgs.add addExports
+tasks.withType(JavaCompile).forEach {
+    it.options.compilerArgs.addAll addJvmArgs
 }
 
 application {
     mainModule = 'airsquared.blobsaver'
     mainClass = 'airsquared.blobsaver.app.Main'
-    applicationDefaultJvmArgs.addAll '--enable-preview', addExports
+    applicationDefaultJvmArgs.addAll addJvmArgs
 }
 
 var jarDirectory = os.isMacOsX() ? 'macos/Contents' : os.isWindows() ? 'windows/files' : 'linux'
@@ -97,7 +96,7 @@ jlink {
                 '--dedup-legal-notices=error-if-not-same-content'
     }
     launcher {
-        jvmArgs = [ '--enable-preview', '-Djar.directory={{BIN_DIR}}', addExports ]
+        jvmArgs = addJvmArgs + '-Djar.directory={{BIN_DIR}}'
         if (findProperty('noConsole') != 'false') {
             noConsole = true
         }
@@ -106,7 +105,7 @@ jlink {
         imageOptions = [ '--copyright', copyright, '--description', description]
         installerOptions.addAll '--about-url', 'https://github.com/airsquared/blobsaver'
         vendor = 'airsquared'
-        installerOutputDir = layout.buildDirectory.dir('distributions').get().asFile
+        installerOutputDir = file(layout.buildDirectory.dir('distributions'))
 
         if (os.isMacOsX()) {
             installerType = 'dmg'
@@ -160,9 +159,9 @@ task windowsInstaller(type: Exec, dependsOn: jpackageImage) { // requires inno s
             from 'dist/windows/blob.ico' into layout.buildDirectory.dir('jpackage')
         }
         copy {
-            from '/dist/windows/blobsaver.iss' into layout.buildDirectory.dir('jpackage')
-            filter(ReplaceTokens, tokens: [AppName: project.name, AppVersion: version, AppCopyright: copyright,
-                                           OutputDir: "${layout.buildDirectory.get()}\\distributions".toString()])
+            from 'dist/windows/blobsaver.iss' into layout.buildDirectory.dir('jpackage')
+            filter(ReplaceTokens, tokens: [Name: project.name, Version: version, Copyright: copyright,
+                                           OutputDir: layout.buildDirectory.dir('distributions').get().toString()])
         }
     }
     commandLine 'iscc', '/Qp', "${layout.buildDirectory.get()}\\jpackage\\blobsaver.iss"

dist/windows/blobsaver.iss

@@ -1,12 +1,11 @@
-; Script generated by the Inno Setup Script Wizard.
-; This script should only be run from Gradle; otherwise some values will not be set properly
+; This script should only be run from Gradle; otherwise values will not be set
 
-#define MyAppName "@AppName@"
-#define MyAppVersion "@AppVersion@"
+#define MyAppName "@Name@"
+#define MyAppVersion "@Version@"
 #define MyAppPublisher "airsquared"
-#define MyAppURL "https://www.github.com/airsquared/@AppName@"
-#define MyAppExeName "@AppName@.exe"
-#define MyAppCopyright "@AppCopyright@"
+#define MyAppURL "https://www.github.com/airsquared/@Name@"
+#define MyAppExeName "@Name@.exe"
+#define MyAppCopyright "@Copyright@"
 #define OutputDir "@OutputDir@"
 
 [Setup]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

src/main/java/airsquared/blobsaver/app/DebugWindow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021  airsquared
+ * Copyright (c) 2023  airsquared
  *
  * This file is part of blobsaver.
  *

src/main/java/airsquared/blobsaver/app/Main.java

@@ -38,7 +38,7 @@
 
 public class Main {
 
-    static final String appVersion = "v3.5.2";
+    static final String appVersion = "v3.6.0";
     static final String copyright = "Copyright (c) 2023 airsquared";
     static Stage primaryStage;
     // make sure to set system property before running (automatically set if running from gradle)

src/main/java/airsquared/blobsaver/app/Prefs.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021  airsquared
+ * Copyright (c) 2023  airsquared
  *
  * This file is part of blobsaver.
  *

src/main/java/airsquared/blobsaver/app/TSS.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021  airsquared
+ * Copyright (c) 2023  airsquared
  *
  * This file is part of blobsaver.
  *

src/main/resources/airsquared/blobsaver/app/boardconfigs.properties

@@ -1,21 +1,4 @@
 # suppress inspection "UnusedProperty" for whole file
-#
-# Copyright (c) 2021  airsquared
-#
-# This file is part of blobsaver.
-#
-# blobsaver is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# blobsaver is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with blobsaver.  If not, see <https://www.gnu.org/licenses/>.
-#
 iPhone2,1=n88ap
 iPhone3,1=n90ap
 iPhone3,2=n90bap