From fc315981c1d0fa597eb40d5b9e6370dc54750e96 Mon Sep 17 00:00:00 2001
From: Alexander von Trostorff <19996713+axel1200@users.noreply.github.com>
Date: Thu, 16 Jan 2020 17:35:44 +0100
Subject: [PATCH] Feature/#141 ci build (#142)

CI build releases
---
 .github/workflows/release.yml                 | 39 +++++++++++++++++++
 .github/workflows/{gradle.yml => test.yml}    |  0
 .idea/codeStyles/Project.xml                  | 24 ++++++++++++
 build.gradle                                  | 39 ++++++++++++++++---
 gradle.properties                             |  3 ++
 .../treasure/hunt/service/io/FileService.java | 10 +++--
 .../treasure/hunt/view/MainController.java    |  8 +++-
 src/main/resources/layout/main.fxml           |  3 +-
 8 files changed, 115 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/release.yml
 rename .github/workflows/{gradle.yml => test.yml} (100%)
 create mode 100644 gradle.properties

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..dc0dd68e
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,39 @@
+name: Build and relase
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          body: Auto generated release
+          draft: true
+          prerelease: false
+      - name: Build win zip
+        run: ./gradlew distZip -PprojVersion=${GITHUB_REF##*/} -PjavafxPlatform=win
+      - name: Build linux tar
+        run: ./gradlew distTar -PprojVersion=${GITHUB_REF##*/} -PjavafxPlatform=linux
+      - name: Build mac tar
+        run: ./gradlew distTar -PprojVersion=${GITHUB_REF##*/} -PjavafxPlatform=mac && ls ./build/distributions
+      - name: Upload Assets to Release with a wildcard
+        uses: axel1200/release-asset-action@v1
+        with:
+          pattern: "build/distributions/*"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          release-url: ${{ steps.create_release.outputs.upload_url }}
\ No newline at end of file
diff --git a/.github/workflows/gradle.yml b/.github/workflows/test.yml
similarity index 100%
rename from .github/workflows/gradle.yml
rename to .github/workflows/test.yml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 02eb89e5..af193ac2 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,29 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <DBN-PSQL>
+      <case-options enabled="true">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false" />
+    </DBN-PSQL>
+    <DBN-SQL>
+      <case-options enabled="true">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false">
+        <option name="STATEMENT_SPACING" value="one_line" />
+        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
+        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
+      </formatting-settings>
+    </DBN-SQL>
     <DBN-PSQL>
       <case-options enabled="true">
         <option name="KEYWORD_CASE" value="lower" />
diff --git a/build.gradle b/build.gradle
index 32ebc90a..8a625b0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,20 @@ repositories {
     }
 }
 
+if (javafxPlatform == "unspecified") {
+    switch (org.gradle.internal.os.OperatingSystem.current()) {
+        case org.gradle.internal.os.OperatingSystem.LINUX:
+            project.ext.javafxPlatform = "linux"
+            break
+        case org.gradle.internal.os.OperatingSystem.MAC_OS:
+            project.ext.javafxPlatform = "mac"
+            break
+        case org.gradle.internal.os.OperatingSystem.WINDOWS:
+            project.ext.javafxPlatform = "win"
+            break
+    }
+}
+println "Platform is: ${javafxPlatform}"
 
 dependencies {
 
@@ -36,6 +50,20 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.1.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.1.0'
 
+    compile("org.openjfx:javafx-base:${javafxVersion}:${javafxPlatform}")
+    compile("org.openjfx:javafx-controls:${javafxVersion}:${javafxPlatform}")
+    compile("org.openjfx:javafx-graphics:${javafxVersion}:${javafxPlatform}")
+    compile("org.openjfx:javafx-fxml:${javafxVersion}:${javafxPlatform}")
+}
+
+project.version = project.projVersion.replace('v','')
+
+distZip {
+    archiveName "${project.name}-v${project.version}-${javafxPlatform}.zip"
+}
+
+distTar {
+    archiveName "${project.name}-v${project.version}-${javafxPlatform}.tar"
 }
 
 test {
@@ -43,7 +71,7 @@ test {
 }
 
 javafx {
-    version = "11"
+    version = "${javafxVersion}"
     modules = ['javafx.base', 'javafx.controls', 'javafx.fxml', 'javafx.graphics']
     /**
      * https://github.com/openjfx/javafx-gradle-plugin
@@ -51,13 +79,12 @@ javafx {
      * running the build. By declaring the dependency configuration compileOnly, the native binaries will not be
      * included. You will need to provide those separately during deployment for each target platform.
      */
-    // configuration = 'compileOnly'
+     configuration = 'compileOnly'
 }
 
-mainClassName = 'com.treasure.hunt.JavaFXLauncher'
+mainClassName = 'com.treasure.hunt.Main'
 
 group = 'com.treasure'
-version = '0.8.2'
 description = 'hunt'
 sourceCompatibility = '11'
 
@@ -65,10 +92,10 @@ tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
 
-
 jar {
     manifest {
-        attributes 'Main-Class': 'com.treasure.hunt.JavaFXLauncher'
+        attributes 'Main-Class': 'com.treasure.hunt.Main',
+                                 'Implementation-Version': project.version
     }
     from {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..04945ff0
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,3 @@
+projVersion=snapshot
+javafxPlatform=unspecified
+javafxVersion=11
\ No newline at end of file
diff --git a/src/main/java/com/treasure/hunt/service/io/FileService.java b/src/main/java/com/treasure/hunt/service/io/FileService.java
index dfeb0708..311167a2 100644
--- a/src/main/java/com/treasure/hunt/service/io/FileService.java
+++ b/src/main/java/com/treasure/hunt/service/io/FileService.java
@@ -120,17 +120,21 @@ public void loadGameManager() {
     }
 
     private boolean correctVersion(DataWithVersion dataWithVersion) {
-        boolean divergentVersion = dataWithVersion.getVersion() != null && !dataWithVersion.getVersion().equals(GameManager.class.getPackage().getImplementationVersion());
-        boolean loadingDevelopmentVersion = dataWithVersion.getVersion() == null && GameManager.class.getPackage().getImplementationVersion() != null;
+        boolean divergentVersion = !isDevelopmentVersion(dataWithVersion.getVersion()) && !dataWithVersion.getVersion().equals(GameManager.class.getPackage().getImplementationVersion());
+        boolean loadingDevelopmentVersion = isDevelopmentVersion(dataWithVersion.getVersion()) && isDevelopmentVersion(GameManager.class.getPackage().getImplementationVersion());
 
         return divergentVersion || loadingDevelopmentVersion;
     }
 
+    private boolean isDevelopmentVersion(String version) {
+        return version == null || version.equalsIgnoreCase("snapshot") || version.equalsIgnoreCase("undefined");
+    }
+
     private boolean askUserWhetherToLoadWrongVersion(String oldVersion) {
         Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
         alert.setTitle("Proceed loading wrong version");
         alert.setHeaderText("The file was record with a different version than your program is running. Loading it might cause unexpected behaviour.");
-        alert.setContentText("Version of file was " + (oldVersion == null ? "development" : oldVersion));
+        alert.setContentText("Version of file was " + (oldVersion));
 
         Optional<ButtonType> option = alert.showAndWait();
 
diff --git a/src/main/java/com/treasure/hunt/view/MainController.java b/src/main/java/com/treasure/hunt/view/MainController.java
index 2d426ad4..e96205e2 100644
--- a/src/main/java/com/treasure/hunt/view/MainController.java
+++ b/src/main/java/com/treasure/hunt/view/MainController.java
@@ -58,10 +58,14 @@ public class MainController {
     public HBox stepViewNavigator;
 
     @FXML
-    public NavigationController stepViewNavigatorController;
+    private NavigationController stepViewNavigatorController;
+
+    @FXML
+    private Label versionLabel;
 
     @FXML
     private WidgetBarController leftWidgetBarController;
+
     @FXML
     private WidgetBarController rightWidgetBarController;
 
@@ -82,6 +86,8 @@ public class MainController {
 
     public void initialize() {
         canvasController.setGameManager(gameManager);
+        String implementationVersion = getClass().getPackage().getImplementationVersion();
+        versionLabel.setText(implementationVersion == null ? "snapshot" : "v" + implementationVersion);
         setListStringConverters();
         fillLists();
         addPromptBindings();
diff --git a/src/main/resources/layout/main.fxml b/src/main/resources/layout/main.fxml
index d422a3e1..5669b13a 100644
--- a/src/main/resources/layout/main.fxml
+++ b/src/main/resources/layout/main.fxml
@@ -32,7 +32,8 @@
             <children>
                 <HBox alignment="CENTER_LEFT" maxWidth="60000.0" spacing="5.0" HBox.hgrow="ALWAYS">
                     <children>
-                        <Label text="TreasureHunt"/>
+                        <Label text="TreasureHunt: "/>
+                        <Label fx:id="versionLabel"/>
                     </children>
                 </HBox>
                 <HBox alignment="CENTER_RIGHT" maxWidth="60000.0" spacing="5.0" HBox.hgrow="ALWAYS">