Miscellaneous improvements

Author: airsquared

.gitattributes

@@ -7,4 +7,6 @@ gradlew.bat text eol=crlf
 gradlew text eol=lf
 
 # Tell GitHub’s linguist which files to ignore
-gradle/InnoSetup6/* linguist-vendored
+gradle/InnoSetup6/* linguist-vendored
+gradlew linguist-vendored
+gradlew.bat linguist-vendored

.github/stale.yml

@@ -13,7 +13,6 @@ staleLabel: Stale
 markComment: >
   This issue has been automatically marked as stale because it has not had
   recent activity. It will be closed if no further activity occurs. If you
-  would like this to remain open, please comment,
-  otherwise this issue will be closed in 5 days.'
+  would like this issue to remain open, please comment.
 # Comment to post when closing a stale issue. Set to `false` to disable
 closeComment: false

.github/workflows/main.yml

@@ -9,13 +9,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '18'
+          java-version: '19'
           distribution: 'zulu'
       - name: Install Linux dependencies
         run: sudo apt-get install libplist-dev libimobiledevice-dev libirecovery-1.0-dev
@@ -35,7 +35,7 @@ jobs:
           name: failure-${{ runner.os }}
           path: build/reports/
   release:
-    name: Create pubilc releases
+    name: Create public releases
     runs-on: ubuntu-latest
     needs: build
     if: "startsWith(github.event.head_commit.message, 'Release')"

.idea/compiler.xml

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021  airsquared
+ * Copyright (c) 2023  airsquared
  *
  * This file is part of blobsaver.
  *
@@ -20,9 +20,8 @@ import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 
 plugins {
-    id 'java'
     id 'application'
-    id 'com.github.ben-manes.versions' version '0.45.0'
+    id 'com.github.ben-manes.versions' version '0.46.0'
     id 'org.beryx.jlink' version '2.26.0'
     id 'org.openjfx.javafxplugin' version '0.0.13'
 
@@ -34,17 +33,14 @@ idea.module.outputDir file("out/production/classes") // fix running via IntelliJ
  * REMEMBER: also update the version string in Main.java
  */
 version = "3.5.0"
-description = "A cross-platform GUI app for saving SHSH blobs"
+description = "A cross-platform GUI and CLI app for saving SHSH blobs"
 String appIdentifier = "airsquared.blobsaver.app"
-String copyright = "Copyright (c) 2021 airsquared"
+String copyright = "Copyright (c) 2023 airsquared"
 def os = DefaultNativePlatform.currentOperatingSystem
 
 startScripts.enabled = distZip.enabled = distTar.enabled = false
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(18)
-tasks.withType(JavaCompile).configureEach {
-    sourceCompatibility = 18
-}
+java.toolchain.languageVersion = JavaLanguageVersion.of(19)
 
 repositories {
     mavenCentral()
@@ -56,15 +52,15 @@ dependencies {
         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.22'
-    implementation 'info.picocli:picocli:4.7.1'
+    implementation 'org.apache.commons:commons-compress:1.23.0'
+    implementation 'info.picocli:picocli:4.7.2'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
     testImplementation group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-12.0.1+2'
 }
 
 javafx {
-    version = '19'
+    version = '20'
     modules = [ 'javafx.controls', 'javafx.fxml' ]
 }
 
@@ -109,6 +105,7 @@ jlink {
     }
     jpackage {
         imageOptions = [ '--copyright', copyright, '--description', description]
+        installerOptions.addAll '--about-url', 'https://github.com/airsquared/blobsaver'
         vendor = 'airsquared'
         installerOutputDir = file("${buildDir}/distributions/")
 
@@ -174,6 +171,9 @@ task createLinuxTargz(type: Tar, dependsOn: jpackageImage) {
 
 task windowsInstaller(dependsOn: jpackageImage) { // requires inno setup to be installed
     doFirst {
+        copy {
+            from "${projectDir}/dist/windows/blob.ico" into "${buildDir}/jpackage"
+        }
         copy {
             from "${projectDir}/dist/windows/blobsaver.iss" into "${buildDir}/jpackage"
             filter(ReplaceTokens, tokens: [AppName: project.name, AppVersion: version, AppCopyright: copyright,

.idea/misc.xml

@@ -22,14 +22,14 @@ AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 AppCopyright={#MyAppCopyright}
-ArchitecturesAllowed=x64
-ArchitecturesInstallIn64BitMode=x64
+ArchitecturesAllowed=x64 arm64
+ArchitecturesInstallIn64BitMode=x64 arm64
 Uninstallable=not IsTaskSelected('portableMode')
 DefaultDirName={pf}\{#MyAppName}
 DisableProgramGroupPage=yes
 OutputDir={#OutputDir}
 OutputBaseFilename=blobsaver-{#MyAppVersion}
-SetupIconFile=blobsaver\blobsaver.ico
+SetupIconFile=blob.ico
 Compression=lzma
 SolidCompression=yes
 

build.gradle

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

dist/windows/blobsaver.iss

@@ -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.