JavaFX 16, minor build improvements, update copyright

Author: airsquared

.github/workflows/main.yml

@@ -28,4 +28,4 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ runner.os }}
-          path: build/jpackage/*
+          path: build/distributions/*

.idea/bashsupport_project.xml

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020  airsquared
+ * Copyright (c) 2021  airsquared
  *
  * This file is part of blobsaver.
  *
@@ -51,10 +51,10 @@ dependencies {
     else if (os.isWindows()) fxPlatform = 'win'
     else if (os.isLinux()) fxPlatform = 'linux'
 
-    implementation "org.openjfx:javafx-base:15.0.1:$fxPlatform"
-    implementation "org.openjfx:javafx-controls:15.0.1:$fxPlatform"
-    implementation "org.openjfx:javafx-graphics:15.0.1:$fxPlatform"
-    implementation "org.openjfx:javafx-fxml:15.0.1:$fxPlatform"
+    implementation "org.openjfx:javafx-base:16:$fxPlatform"
+    implementation "org.openjfx:javafx-controls:16:$fxPlatform"
+    implementation "org.openjfx:javafx-graphics:16:$fxPlatform"
+    implementation "org.openjfx:javafx-fxml:16:$fxPlatform"
 
     implementation group: 'org.json', name: 'json', version: '20210307'
     implementation 'de.jangassen:nsmenufx:3.1.0'
@@ -83,7 +83,7 @@ private String getJarDirectory() {
     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}";
+    return "${projectDir}/dist/${dir}"
 }
 
 run {
@@ -104,6 +104,7 @@ jlink {
     }
     jpackage {
         imageOptions = [ '--copyright', copyright, '--description', description, '--vendor', 'airsquared']
+        installerOutputDir = file("${buildDir}/distributions/")
 
         if (os.isMacOsX()) {
             installerType = "dmg"
@@ -145,28 +146,35 @@ jlink {
 
 }
 
+if (!os.isWindows()) {
+    assemble.dependsOn jpackage
+}
+
 task createLinuxTargz(type: Tar, dependsOn: jpackageImage) {
-    archiveFileName = "blobsaver-linux.tar.gz"
+    archiveFileName = "blobsaver-${project.version}.tar.gz"
     compression = Compression.GZIP
     destinationDirectory = file("${buildDir}/distributions/")
     from "${buildDir}/jpackage/blobsaver"
 
     if (os.isLinux()) {
-        assemble.dependsOn createLinuxTargz
+        jpackage.finalizedBy createLinuxTargz
     }
 }
 
 task windowsInstaller(dependsOn: jpackageImage) { // requires inno setup to be installed
     doFirst {
         copy {
             from "${projectDir}/dist/windows/blobsaver.iss" into "${buildDir}/jpackage"
-            filter(ReplaceTokens, tokens: [AppName: project.name, AppVersion: version, AppCopyright: copyright])
+            filter(ReplaceTokens, tokens: [AppName: project.name, AppVersion: version, AppCopyright: copyright,
+                                           OutputDir: "${buildDir}\\distributions".toString()])
         }
         exec {
             commandLine "iscc", "/Qp", "${buildDir}\\jpackage\\blobsaver.iss"
         }
         delete "${buildDir}/jpackage/blobsaver.iss"
     }
-}
 
-assemble.dependsOn os.isWindows() ? windowsInstaller : jpackage
+    if (os.isWindows()) {
+        assemble.dependsOn windowsInstaller
+    }
+}

.idea/misc.xml

@@ -7,6 +7,7 @@
 #define MyAppURL "https://www.github.com/airsquared/blobsaver"
 #define MyAppExeName "blobsaver.exe"
 #define MyAppCopyright "@AppCopyright@"
+#define OutputDir "@OutputDir@"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -21,13 +22,13 @@ AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 AppCopyright={#MyAppCopyright}
-ArchitecturesAllowed=x64 arm64
-ArchitecturesInstallIn64BitMode=x64 arm64
+ArchitecturesAllowed=x64
+ArchitecturesInstallIn64BitMode=x64
 Uninstallable=not IsTaskSelected('portableMode')
 DefaultDirName={pf}\{#MyAppName}
 DisableProgramGroupPage=yes
-OutputDir=.
-OutputBaseFilename=blobsaver-windows
+OutputDir={#OutputDir}
+OutputBaseFilename=blobsaver-{#MyAppVersion}
 SetupIconFile=blobsaver\blobsaver.ico
 Compression=lzma
 SolidCompression=yes

build.gradle

@@ -1,21 +1,3 @@
-/*
- * Copyright (c) 2020  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/>.
- */
-
 pluginManagement {
     repositories {
         mavenCentral()

dist/windows/blobsaver.iss

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

settings.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020  airsquared
+ * Copyright (c) 2021  airsquared
  *
  * This file is part of blobsaver.
  *
@@ -294,7 +294,7 @@ public void aboutMenuHandler(Event ignored) {
 
         alert.setTitle("About");
         alert.setHeaderText("blobsaver " + Main.appVersion);
-        alert.setContentText("blobsaver Copyright (c) 2019  airsquared\n\n" +
+        alert.setContentText("blobsaver Copyright (c) 2021 airsquared\n\n" +
                 "This program is licensed under GNU GPL v3.0-only");
         Utils.resizeAlertButtons(alert);
 

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020  airsquared
+ * Copyright (c) 2021  airsquared
  *
  * This file is part of blobsaver.
  *
@@ -27,6 +27,7 @@
 import java.util.Map;
 import java.util.Properties;
 
+@SuppressWarnings({"unchecked", "rawtypes"})
 public class Devices {
 
     private static final ObservableList<String> iPhones = unmodifiableArrayList("iPhone 3G[S]", "iPhone 4 (GSM)",
@@ -78,7 +79,6 @@ public class Devices {
         try {
             Properties properties = new Properties();
             properties.load(Devices.class.getResourceAsStream("devicemodels.properties"));
-            //noinspection unchecked,rawtypes
             deviceModelIdentifiers = (Map) properties;
             deviceModelIdentifiers.forEach((k, v) -> identifierDeviceModels.put(v, k));
         } catch (IOException e) {