Build logic updates

Author: airsquared

.github/workflows/main.yml

@@ -24,9 +24,10 @@ jobs:
         uses: gradle/gradle-build-action@v2
         with:
           arguments: build --no-daemon
-      - uses: actions/upload-artifact@v3
+      - uses: initdc/upload-artifact@feat/artifact-per-file
         with:
-          name: ${{ runner.os }}
+          artifact-per-file: true
+          artifact-name-rule: ${{ runner.os }}${ext}
           path: build/distributions/*
       - name: Upload reports on failure
         if: ${{ failure() }}

README.md

@@ -18,18 +18,22 @@ A cross-platform GUI and CLI for automatically saving SHSH blobs. [Download](htt
 - Automate all features with the CLI
 - Save blobs to TSS Saver and SHSH Host as well with one click
 
+## Nightly Builds
+
+You can get the latest nightly build [here](https://nightly.link/airsquared/blobsaver/workflows/main/master) or get older nightly builds at [Actions](https://github.com/airsquared/blobsaver/actions).
+
 ## Feedback
 
 Please send feedback via [Github Issue](https://github.com/airsquared/blobsaver/issues/new/choose) if you encounter any
 bugs/problems or have a feature request.
 
 ## Built With
 
-- JDK 18
+- JDK 19
 - [IntelliJ Idea](https://www.jetbrains.com/idea/)
 - [Gradle](https://gradle.org/)
 - [JLink Plugin](https://github.com/beryx/badass-jlink-plugin)
-- [Inno Setup](http://www.jrsoftware.org/isinfo.php) (creating Windows installer)
+- [Inno Setup](http://www.jrsoftware.org/isinfo.php) (Windows installer)
 
 See the full credits [here](libraries_used.txt).
 

build.gradle

@@ -172,10 +172,15 @@ task createZip(type: Zip, dependsOn: jpackageImage) {
     destinationDirectory = file("${buildDir}/distributions/")
 }
 
-task createLinuxTargz(type: Tar, dependsOn: jpackageImage) {
-    archiveFileName = "blobsaver-${project.version}.tar.gz"
+task createTgz(type: Tar, dependsOn: jpackageImage) {
+    if (os.isMacOsX()) {
+        String arch = DefaultNativePlatform.currentArchitecture.amd64 ? 'intel' : 'arm'
+        archiveFileName = "${project.name}-${arch}-${project.version}.tgz"
+    } else {
+        archiveFileName = "${project.name}-${project.version}.tgz"
+    }
     compression = Compression.GZIP
-    from "${buildDir}/jpackage/blobsaver"
+    from "${buildDir}/jpackage"
     destinationDirectory = file("${buildDir}/distributions/")
 }
 
@@ -203,9 +208,9 @@ task bumpCaskPR(type: Exec) {
 if (!os.isWindows()) { // never do jpackage on windows
     assemble.dependsOn jpackage // will be disabled on other OS if installerType is set to certain values
 }
-if (findProperty('installerType') == 'tar.gz') {
+if (findProperty('installerType') == 'tar.gz' || findProperty('installerType') == 'tgz') {
     jpackage.enabled = false
-    assemble.dependsOn createLinuxTargz
+    assemble.dependsOn createTgz
 }
 if (findProperty('installerType') == 'zip') {
     jpackage.enabled = false
@@ -218,8 +223,8 @@ if (os.isMacOsX() && findProperty('installerType') == null) {
     jpackage.finalizedBy createZip
 }
 if (os.isLinux() && findProperty('installerType') == null) {
-    jpackage.finalizedBy createLinuxTargz
+    jpackage.finalizedBy createTgz
 }
 if (os.isWindows() && findProperty('installerType') == null) {
     assemble.dependsOn windowsInstaller
-}
+}

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.