Merge pull request #26 from ploiu/jlink_issues

Author: ploiu

.gitignore

@@ -41,4 +41,5 @@ bin/
 ### Mac OS ###
 .DS_Store
 
-app.properties
+app.properties
+file_server_cert.pem

.idea/workspace.xml

@@ -1,3 +1,10 @@
 # file-server-ui
 
 A client frontend for [ploiu/file_server](https://github.com/ploiu/file_server), written in java
+
+## Building
+1. make sure you have the server certificate in the same directory as this README, and make sure it's named `file_server_cert.pem`
+2. run `./gradlew jpackage`
+
+## Installing
+the built installer is located in `./build/file-server-installer`. For linux, you will need to write your own .desktop file until I can figure out how to get the jlink plugin to work with automatic start menu installation. For windows, you will need to navigate to `C:\Program Files\ploiu-file-server` and manually add `ploiu-file-server.exe` to the start menu for the same reason.

README.md

@@ -1,3 +1,5 @@
+import org.apache.tools.ant.taskdefs.condition.Os
+
 buildscript {
     dependencies {
         classpath 'org.openjfx:javafx-plugin:0.0.13'
@@ -8,15 +10,15 @@ plugins {
     id 'idea'
     id 'application'
     id 'org.openjfx.javafxplugin' version '0.0.13'
-    id 'org.beryx.jlink' version '2.25.0'
+    id 'org.beryx.jlink' version '2.26.0'
 }
 
 def versions = [
-        junit   : '5.9.2',
-        mockito : '4.11.0',
-        lombok  : '1.18.24',
-        jackson : '2.14.0',
-        slf4j   : '2.0.5',
+        junit   : '5.10.0',
+        mockito : '5.4.0',
+        lombok  : '1.18.28',
+        jackson : '2.15.2',
+        slf4j   : '2.0.7',
         wiremock: '3.0.0-beta-7'
 ]
 
@@ -28,7 +30,7 @@ sourceCompatibility = 17
 targetCompatibility = 17
 
 group 'ploiu'
-version '1.0-SNAPSHOT'
+version '1.0'
 
 repositories {
     mavenCentral()
@@ -41,7 +43,7 @@ dependencies {
     implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
     implementation "com.fasterxml.jackson.core:jackson-databind:$versions.jackson"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$versions.jackson"
-    implementation 'org.jetbrains:annotations:23.1.0'
+    implementation 'org.jetbrains:annotations:24.0.1'
     implementation 'com.google.inject:guice:5.1.0'
     // because apparently I can't properly build a multipart form to save my life
     implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1'
@@ -79,4 +81,35 @@ jlink {
     launcher {
         name = 'Ploiu File Server'
     }
+    mergedModule {
+        additive = true
+        requires 'org.slf4j'
+        requires 'jdk.crypto.ec'
+    }
+
+    jpackage {
+        imageName = 'ploiu-file-server'
+        skipInstaller = false
+        if (Os.isFamily(Os.FAMILY_UNIX)) {
+            installerType = 'deb'
+        } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+            installerType = 'exe'
+        }
+        installerOutputDir = file("$buildDir/file-server-installer")
+    }
+
+}
+
+tasks.jpackageImage.doFirst {
+    println 'Installing cert to custom runtime...'
+    def flags = ['-importcert', '-cacerts', '-file', './file_server_cert.pem', '-noprompt', '-storepass', 'changeit']
+    // TODO platform-based command
+    exec {
+		if(Os.isFamily(Os.FAMILY_UNIX)) {
+				commandLine('./build/image/bin/keytool', *flags)
+		} else if(Os.isFamily(Os.FAMILY_WINDOWS)) {
+				commandLine('build/image/bin/keytool.exe', *flags)
+		}
+        
+    }
 }

build.gradle

@@ -1,4 +1,6 @@
-module file.server.ui.main {
+// open is required to let the application access everything in src/main/resources
+open module file.server.ui.main {
+
     requires static lombok;
 
     requires java.net.http;
@@ -15,12 +17,6 @@
     requires org.apache.httpcomponents.client5.httpclient5;
     requires org.apache.httpcomponents.core5.httpcore5;
 
-    opens ploiu.model to com.fasterxml.jackson.databind;
-    opens ploiu.module to com.google.guice;
-    opens ploiu.ui to javafx.fxml;
-    opens ploiu.event to javafx.fxml;
-    opens ploiu to javafx.graphics;
-
     exports ploiu.ui to javafx.fxml, javafx.graphics;
     exports ploiu.event to javafx.fxml, javafx.graphics;
     exports ploiu to javafx.graphics;

src/main/java/module-info.java

@@ -1,17 +1,11 @@
-@import "../../theme.css";
+@import "../../styles.css";
 
 .confirm-dialog-root {
     -fx-pref-width: 400;
     -fx-pref-height: 200;
     -fx-background-color: -background;
 }
 
-.confirm-button, .cancel-button {
-    -fx-background-color: -primary;
-    -fx-text-fill: -text;
-    -fx-cursor: hand;
-}
-
 .body-text {
     -fx-text-fill: -error;
     -fx-font-weight: bold;

src/main/resources/ui/components/ConfirmDialog/ConfirmDialog.css

@@ -10,9 +10,9 @@
            styleClass="body-text" text="$bodyText"/>
     <HBox AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.bottomAnchor="50" alignment="CENTER"
           styleClass="button-wrapper">
-        <Button fx:id="cancelButton" styleClass="cancel-button"
+        <Button fx:id="cancelButton" styleClass="btn,btn-secondary"
                 text="$cancelText"/>
-        <Button fx:id="confirmButton" styleClass="confirm-button"
+        <Button fx:id="confirmButton" styleClass="btn,btn-primary"
                 text="$confirmText"/>
     </HBox>
 </fx:root>

src/main/resources/ui/components/ConfirmDialog/ConfirmDialog.fxml

@@ -1,4 +1,4 @@
-@import "../../theme.css";
+@import "../../styles.css";
 
 .text-input-dialog-root {
     -fx-pref-width: 400;

src/main/resources/ui/components/TextInputDialog/TextInputDialog.css

@@ -12,7 +12,7 @@
     <TextField fx:id="textBox" layoutX="37.0" layoutY="88.0" prefHeight="24.0" prefWidth="328.0"
                styleClass="text-box"/>
     <VBox AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.bottomAnchor="50" alignment="CENTER">
-        <Button fx:id="actionButton" styleClass="submit-button"
+        <Button fx:id="actionButton" styleClass="btn,btn-primary"
                 text="$confirmText"/>
     </VBox>
 </fx:root>