#2418 updating jpackage config (#2713)

# Description

Updating the `jpackage` configuration in our build.gradle and CI to
enable installation of the app on multiple OSs

Closes #2418 

## Checklist

- [x] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [x] I have performed a self-review of my own code
- [x] I have attached images of the change if it is UI based
- [x] I have commented my code, particularly in hard-to-understand areas
- [x] If my code has heavily changed functionality I have updated
relevant docs on [Stirling-PDFs doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
- [x] My changes generate no new warnings
- [x] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)

.github/workflows/multiOSReleases.yml

@@ -130,8 +130,8 @@ jobs:
         include:
           - os: windows-latest
             platform: win-
-          # - os: macos-latest
-          #   platform: mac-
+          - os: macos-latest
+            platform: mac-
           # - os: ubuntu-latest
           #   platform: linux-
     runs-on: ${{ matrix.os }}
@@ -168,6 +168,7 @@ jobs:
         env:
           DOCKER_ENABLE_SECURITY: false
           STIRLING_PDF_DESKTOP_UI: true
+          BROWSER_OPEN: true
 
       # Rename and collect artifacts based on OS
       - name: Prepare artifacts
@@ -202,8 +203,8 @@ jobs:
         include:
           - os: windows-latest
             platform: win-
-          # - os: macos-latest
-          #   platform: mac-
+          - os: macos-latest
+            platform: mac-
           # - os: ubuntu-latest
           #   platform: linux-
     runs-on: ubuntu-latest

.gitignore

@@ -21,6 +21,7 @@ pipeline/finishedFolders/
 customFiles/
 configs/
 watchedFolders/
+clientWebUI/
 !cucumber/
 !cucumber/exampleFiles/
 !cucumber/exampleFiles/example_html.zip

build.gradle

@@ -111,18 +111,15 @@ def getMacVersion(String version) {
 
 jpackage {
     input = "build/libs"
-
+    destination = "${projectDir}/build/jpackage"
+    mainJar = "Stirling-PDF-${project.version}.jar"
     appName = "Stirling-PDF"
     appVersion = project.version
     vendor = "Stirling-Software"
-	appDescription = "Stirling PDF - Your Local PDF Editor"
-
-    mainJar = "Stirling-PDF-${project.version}.jar"
-    mainClass = "org.springframework.boot.loader.launch.JarLauncher"
-
+    appDescription = "Stirling PDF - Your Local PDF Editor"
     icon = "src/main/resources/static/favicon.ico"
-
-
+    verbose = true
+//    mainClass = "org.springframework.boot.loader.launch.JarLauncher"
 
     // JVM Options
     javaOptions = [
@@ -136,14 +133,9 @@ jpackage {
         "--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED",
         "--add-opens=java.desktop/sun.awt.windows=ALL-UNNAMED",
         "--add-opens=java.desktop/sun.lwawt=ALL-UNNAMED",
-        "--add-opens=java.desktop/sun.lwawt.macosx=ALL-UNNAMED"
+        "--add-opens=java.desktop/sun.lwawt.macosx=ALL-UNNAMED",
     ]
 
-
-    verbose = true
-
-    destination = "${projectDir}/build/jpackage"
-
     // Windows-specific configuration
     windows {
     	launcherAsService = false

src/main/java/stirling/software/SPDF/EE/EEAppConfig.java

@@ -25,7 +25,7 @@ public class EEAppConfig {
 
     @Bean(name = "runningEE")
     public boolean runningEnterpriseEdition() {
-    	return licenseKeyChecker.getEnterpriseEnabledResult();
+        return licenseKeyChecker.getEnterpriseEnabledResult();
     }
 
     @Bean(name = "SSOAutoLogin")

src/main/java/stirling/software/SPDF/config/security/database/DatabaseConfig.java

@@ -33,7 +33,11 @@ public class DatabaseConfig {
     public DatabaseConfig(
             ApplicationProperties applicationProperties,
             @Qualifier("runningEE") boolean runningEE) {
-    	DATASOURCE_DEFAULT_URL = "jdbc:h2:file:" + InstallationPathConfig.getConfigPath() + File.separator + "stirling-pdf-DB-2.3.232;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE";
+        DATASOURCE_DEFAULT_URL =
+                "jdbc:h2:file:"
+                        + InstallationPathConfig.getConfigPath()
+                        + File.separator
+                        + "stirling-pdf-DB-2.3.232;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE";
         this.applicationProperties = applicationProperties;
         this.runningEE = runningEE;
     }

src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java

@@ -55,7 +55,10 @@ public class GeneralWebController {
         List<String> pipelineConfigs = new ArrayList<>();
         List<Map<String, String>> pipelineConfigsWithNames = new ArrayList<>();
         if (new File(InstallationPathConfig.getPipelineDefaultWebUIConfigsDir()).exists()) {
-            try (Stream<Path> paths = Files.walk(Paths.get(InstallationPathConfig.getPipelineDefaultWebUIConfigsDir()))) {
+            try (Stream<Path> paths =
+                    Files.walk(
+                            Paths.get(
+                                    InstallationPathConfig.getPipelineDefaultWebUIConfigsDir()))) {
                 List<Path> jsonFiles =
                         paths.filter(Files::isRegularFile)
                                 .filter(p -> p.toString().endsWith(".json"))