use *.999 for a development version and flag it in UI

BrightSpots · Sep 15, 2023 · db4ca37 · db4ca37
1 parent 2d47d57
commit db4ca37
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,11 +48,11 @@ jobs:
           # and while we could use some regex to figure out the version number automatically, it seems cleaner
           # to know the expected version number upfront.
           if [ ${{ runner.os }} == 'Windows' ]; then
-            echo "FILEPATH=build/jpackage/RCTab-1.4.0.exe" >> $GITHUB_OUTPUT
+            echo "FILEPATH=build/jpackage/RCTab-1.3.999.exe" >> $GITHUB_OUTPUT
           elif [ ${{ runner.os }} == 'Linux' ]; then
-            echo "FILEPATH=build/jpackage/rctab_1.4.0-1_amd64.deb" >> $GITHUB_OUTPUT
+            echo "FILEPATH=build/jpackage/rctab_1.3.999-1_amd64.deb" >> $GITHUB_OUTPUT
           else
-            echo "FILEPATH=build/jpackage/RCTab-1.4.0.dmg" >> $GITHUB_OUTPUT
+            echo "FILEPATH=build/jpackage/RCTab-1.3.999.dmg" >> $GITHUB_OUTPUT
           fi
       - name: "Create executable filename"
         id: exefn

diff --git a/build.gradle b/build.gradle
@@ -121,7 +121,7 @@ jlink {
     launcher {
         // TODO Sync version number with release.yml and Main.java (github.com/BrightSpots/rcv/issues/662)
         name = "RCTab"
-        version = "1.4.0"
+        version = "1.3.999"
     }
 
     jpackage {

diff --git a/src/main/java/network/brightspots/rcv/GuiConfigController.java b/src/main/java/network/brightspots/rcv/GuiConfigController.java
@@ -49,6 +49,7 @@
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
@@ -72,6 +73,10 @@
 import javafx.scene.control.TextInputDialog;
 import javafx.scene.control.cell.CheckBoxTableCell;
 import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.paint.Color;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
 import javafx.stage.FileChooser.ExtensionFilter;
@@ -124,6 +129,8 @@ public class GuiConfigController implements Initializable {
   @FXML
   private Label labelCurrentlyLoaded;
   @FXML
+  private Label labelVersion;
+  @FXML
   private TextField textFieldContestName;
   @FXML
   private TextField textFieldOutputDirectory;
@@ -858,6 +865,15 @@ private void setWinningRulesDefaultValues() {
   }
 
   private void setDefaultValues() {
+    String versionText = "Running %s version %s".formatted(Main.APP_NAME, Main.APP_VERSION);
+    if (Main.APP_VERSION.endsWith("999")) {
+      versionText += " -- this is a development version";
+      labelVersion.setBackground(
+        new Background(
+          new BackgroundFill(Color.DARKRED, CornerRadii.EMPTY, Insets.EMPTY)));
+      labelVersion.setTextFill(Color.WHITE);
+    }
+    labelVersion.setText(versionText);
     labelCurrentlyLoaded.setText("Currently loaded: <New Config>");
 
     checkBoxCandidateExcluded.setSelected(ContestConfig.SUGGESTED_CANDIDATE_EXCLUDED);

diff --git a/src/main/java/network/brightspots/rcv/Main.java b/src/main/java/network/brightspots/rcv/Main.java
@@ -37,7 +37,7 @@ public class Main extends GuiApplication {
 
   // TODO Sync version number with release.yml and build.gradle:
   // github.com/BrightSpots/rcv/issues/662
-  public static final String APP_VERSION = "1.4.0-alpha";
+  public static final String APP_VERSION = "1.3.999";
 
   /**
    * Main entry point to RCTab.

diff --git a/src/main/resources/network/brightspots/rcv/GuiConfigLayout.fxml b/src/main/resources/network/brightspots/rcv/GuiConfigLayout.fxml
@@ -43,11 +43,19 @@
               text="Open Help Manual"/>
           </Menu>
         </MenuBar>
-        <Label fx:id="labelCurrentlyLoaded">
-          <padding>
-            <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
-          </padding>
-        </Label>
+        <HBox alignment="CENTER_LEFT">
+            <Label fx:id="labelCurrentlyLoaded">
+              <padding>
+                <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
+              </padding>
+            </Label>
+            <Region HBox.hgrow="ALWAYS"/>
+            <Label fx:id="labelVersion" alignment="CENTER_RIGHT" minWidth="200.0">
+              <padding>
+                <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
+              </padding>
+            </Label>
+        </HBox>
       </VBox>
     </top>
     <center>