Build logic updates

Author: airsquared

build.gradle

@@ -27,15 +27,15 @@ plugins {
 
     id 'idea'
 }
-idea.module.outputDir file("out/production/classes") // fix running via IntelliJ
+idea.module.outputDir file('out/production/classes') // fix running via IntelliJ
 
 /*
  * REMEMBER: also update the version string in Main.java
  */
-version = "3.5.1"
-description = "A cross-platform GUI and CLI app for saving SHSH blobs"
-String appIdentifier = "airsquared.blobsaver.app"
-String copyright = "Copyright (c) 2023 airsquared"
+version = '3.5.1'
+description = 'A cross-platform GUI and CLI app for saving SHSH blobs'
+String appIdentifier = 'airsquared.blobsaver.app'
+String copyright = 'Copyright (c) 2023 airsquared'
 def os = DefaultNativePlatform.currentOperatingSystem
 
 startScripts.enabled = distZip.enabled = distTar.enabled = false
@@ -56,7 +56,7 @@ dependencies {
     implementation 'info.picocli:picocli:4.7.4'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3'
-    testImplementation group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-12.0.1+2'
+    testImplementation 'org.testfx:openjfx-monocle:jdk-12.0.1+2'
 }
 
 javafx {
@@ -71,26 +71,26 @@ compileJava {
 }
 
 application {
-    mainModule = "airsquared.blobsaver"
-    mainClass = "airsquared.blobsaver.app.Main"
+    mainModule = 'airsquared.blobsaver'
+    mainClass = 'airsquared.blobsaver.app.Main'
     applicationDefaultJvmArgs.addAll addExports
 }
 
 private String getJarDirectory() {
     String dir = ""
-    if (DefaultNativePlatform.currentOperatingSystem.isMacOsX()) dir = "macos/Contents"
-    else if (DefaultNativePlatform.currentOperatingSystem.isWindows()) dir = "windows/files"
-    else if (DefaultNativePlatform.currentOperatingSystem.isLinux()) dir = "linux"
+    if (DefaultNativePlatform.currentOperatingSystem.isMacOsX()) dir = 'macos/Contents'
+    else if (DefaultNativePlatform.currentOperatingSystem.isWindows()) dir = 'windows/files'
+    else if (DefaultNativePlatform.currentOperatingSystem.isLinux()) dir = 'linux'
     return "${projectDir}/dist/${dir}"
 }
 
 run {
-    systemProperty "jar.directory", getJarDirectory()
+    systemProperty 'jar.directory', getJarDirectory()
 }
 
 test {
     useJUnitPlatform()
-    systemProperty "jar.directory", getJarDirectory()
+    systemProperty 'jar.directory', getJarDirectory()
     jvmArgs addExports
     jvmArgs '--add-exports=javafx.graphics/com.sun.glass.ui=org.testfx.monocle'
 }
@@ -103,7 +103,7 @@ jlink {
     launcher {
         jvmArgs = [ '-Djar.directory={{BIN_DIR}}' ]
         jvmArgs.addAll addExports
-        if (findProperty("noConsole") != 'false') {
+        if (findProperty('noConsole') != 'false') {
             noConsole = true
         }
     }
@@ -114,9 +114,9 @@ jlink {
         installerOutputDir = file("${buildDir}/distributions/")
 
         if (os.isMacOsX()) {
-            installerType = "dmg"
-            String arch = DefaultNativePlatform.currentArchitecture.amd64 ? "intel" : "arm"
-            installerName = name + "-" + arch
+            installerType = 'dmg'
+            String arch = DefaultNativePlatform.currentArchitecture.amd64 ? 'intel' : 'arm'
+            installerName = "${name}-${arch}"
             imageOptions.addAll '--mac-package-identifier', appIdentifier
             icon = "${projectDir}/dist/macos/Contents/Resources/blob.icns"
         } else if (os.isWindows()) {
@@ -143,13 +143,13 @@ jlink {
             into "${buildDir}/jpackage/blobsaver.app/Contents/Resources"
         }
         exec { // needed to prevent "application is damaged" error when opening quarantined app
-            commandLine "codesign", "--force", "--deep", "--sign", "-", "${buildDir}/jpackage/blobsaver.app"
+            commandLine 'codesign', '--force', '--deep', '--sign', '-', "${buildDir}/jpackage/blobsaver.app"
         }
     } else if (os.isWindows()) jpackageImage.doLast {
         copy {
             from "${projectDir}/dist/windows/files", "${buildDir}/jpackage/blobsaver/runtime/bin/zip.dll"
-            rename "LICENSE_windows", "LICENSE"
-            rename "libraries_used_windows.txt", "libraries_used.txt"
+            rename 'LICENSE_windows', 'LICENSE'
+            rename 'libraries_used_windows.txt', 'libraries_used.txt'
             into "${buildDir}/jpackage/blobsaver"
         }
     } else jpackageImage.doLast {
@@ -161,23 +161,22 @@ jlink {
 
 }
 
-if (!os.isWindows() && findProperty('installerType') != "tar.gz") {
-    assemble.dependsOn jpackage
-}
-if (findProperty('installerType') == "tar.gz") {
-    jpackage.enabled = false
-    assemble.dependsOn createLinuxTargz
+task createZip(type: Zip, dependsOn: jpackageImage) {
+    if (os.isMacOsX()) {
+        String arch = DefaultNativePlatform.currentArchitecture.amd64 ? 'intel' : 'arm'
+        archiveFileName = "${project.name}-${arch}-${project.version}.zip"
+    } else {
+        archiveFileName = "${project.name}-${project.version}.zip"
+    }
+    from "${buildDir}/jpackage"
+    destinationDirectory = file("${buildDir}/distributions/")
 }
 
 task createLinuxTargz(type: Tar, dependsOn: jpackageImage) {
     archiveFileName = "blobsaver-${project.version}.tar.gz"
     compression = Compression.GZIP
-    destinationDirectory = file("${buildDir}/distributions/")
     from "${buildDir}/jpackage/blobsaver"
-
-    if (os.isLinux()) {
-        jpackage.finalizedBy createLinuxTargz
-    }
+    destinationDirectory = file("${buildDir}/distributions/")
 }
 
 task windowsInstaller(dependsOn: jpackageImage) { // requires inno setup to be installed
@@ -191,12 +190,36 @@ task windowsInstaller(dependsOn: jpackageImage) { // requires inno setup to be i
                                            OutputDir: "${buildDir}\\distributions".toString()])
         }
         exec {
-            commandLine "iscc", "/Qp", "${buildDir}\\jpackage\\blobsaver.iss"
+            commandLine 'iscc', '/Qp', "${buildDir}\\jpackage\\blobsaver.iss"
         }
         delete "${buildDir}/jpackage/blobsaver.iss"
     }
+}
 
-    if (os.isWindows() && findProperty('installerType') != "portable") {
-        assemble.dependsOn windowsInstaller
-    }
+task bumpCaskPR(type: Exec) {
+    commandLine 'brew', 'bump-cask-pr', 'blobsaver', '--no-audit', '--no-style', '--version', version
+}
+
+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') {
+    jpackage.enabled = false
+    assemble.dependsOn createLinuxTargz
+}
+if (findProperty('installerType') == 'zip') {
+    jpackage.enabled = false
+    assemble.dependsOn createZip
+}
+if (findProperty('installerType') == 'portable') {
+    jpackage.enabled = false
+}
+if (os.isMacOsX() && findProperty('installerType') == null) {
+    jpackage.finalizedBy createZip
+}
+if (os.isLinux() && findProperty('installerType') == null) {
+    jpackage.finalizedBy createLinuxTargz
 }
+if (os.isWindows() && findProperty('installerType') == null) {
+    assemble.dependsOn windowsInstaller
+}

dist/windows/blobsaver.iss

@@ -4,8 +4,8 @@
 #define MyAppName "@AppName@"
 #define MyAppVersion "@AppVersion@"
 #define MyAppPublisher "airsquared"
-#define MyAppURL "https://www.github.com/airsquared/blobsaver"
-#define MyAppExeName "blobsaver.exe"
+#define MyAppURL "https://www.github.com/airsquared/@AppName@"
+#define MyAppExeName "@AppName@.exe"
 #define MyAppCopyright "@AppCopyright@"
 #define OutputDir "@OutputDir@"
 
@@ -28,7 +28,7 @@ Uninstallable=not IsTaskSelected('portableMode')
 DefaultDirName={pf}\{#MyAppName}
 DisableProgramGroupPage=yes
 OutputDir={#OutputDir}
-OutputBaseFilename=blobsaver-{#MyAppVersion}
+OutputBaseFilename={#MyAppName}-{#MyAppVersion}
 SetupIconFile=blob.ico
 Compression=lzma
 SolidCompression=yes

gradle/wrapper/gradle-wrapper.properties

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

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

@@ -20,9 +20,7 @@
 
 import com.sun.jna.Platform;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -73,7 +71,7 @@ private static void macosBackgroundFile() {
                 "</dict>" +
                 "</plist>";
         try {
-            Files.createDirectories(Path.of(System.getProperty("user.home"), "Library/LaunchAgents"));
+            Files.createDirectories(plistFilePath.getParent());
             Files.writeString(plistFilePath, plist);
             System.out.println("Wrote to: " + plistFilePath);
         } catch (IOException e) {
@@ -272,8 +270,7 @@ private static void execute(String program, String... args) {
     }
 
     private static boolean outputMatches(Predicate<String> predicate, String... args) {
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(
-                new ProcessBuilder(args).redirectErrorStream(true).start().getInputStream()))) {
+        try (var reader = new ProcessBuilder(args).redirectErrorStream(true).start().inputReader()) {
             return reader.lines().anyMatch(predicate);
         } catch (IOException e) {
             throw new UncheckedIOException(e);

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

@@ -37,10 +37,8 @@
 import javafx.stage.Window;
 import org.apache.commons.compress.archivers.zip.ZipFile;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.UncheckedIOException;
@@ -57,6 +55,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
@@ -224,21 +223,18 @@ static String executeProgram(List<String> command) throws IOException {
 
     static String executeProgram(List<String> command, boolean print) throws IOException {
         Process process = new ProcessBuilder(command).redirectErrorStream(true).start();
-        StringBuilder logBuilder = new StringBuilder();
-
-        try (var reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                if (print) {
-                    System.out.println(line);
-                }
-                logBuilder.append(line).append("\n");
+        String log;
+        try (var reader = process.inputReader()) {
+            if (print) {
+                log = reader.lines().peek(System.out::println).collect(Collectors.joining("\n"));
+            } else {
+                log = reader.lines().collect(Collectors.joining("\n"));
             }
             process.waitFor();
+            return log;
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
-        return logBuilder.toString();
     }
 
     static void reportError(Alert alert) {