From 07f36be7add7f93b8e8457fe248fdbe568b26ccb Mon Sep 17 00:00:00 2001
From: Mike Hearn <mike@hydraulic.software>
Date: Wed, 21 Jun 2023 18:19:09 +0200
Subject: [PATCH] Upstream latest Conveyor packaging changes (#62)

Update to new Conveyor 6 features:

1. Use aggressive updates on Windows too.
2. Use app.site.copy-to to upload the repository automatically.

* Set versions in conveyor.conf from Maven.
* Conveyor: add MS Store release config, update CL to 9
* Conveyor: Allow auto-detection of needed JDK modules, force zipfs
* Conveyor: Use mvn wrapper
---
 .gitignore             |  4 +++-
 conveyor.conf          | 11 ++++-------
 ms-store.conveyor.conf | 21 +++++++++++++++++++++
 3 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 ms-store.conveyor.conf

diff --git a/.gitignore b/.gitignore
index 05aeaeb..bf7bfaa 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 # Conveyor
 output
-
+signed.conveyor.conf
+self-signed.conveyor.conf
+ms-store-creds.conf
 
 # Created by https://www.toptal.com/developers/gitignore/api/maven,linux,eclipse,windows,intellij+all,grunt,node
 # Edit at https://www.toptal.com/developers/gitignore?templates=maven,linux,eclipse,windows,intellij+all,grunt,node
diff --git a/conveyor.conf b/conveyor.conf
index 41dc52b..e2edf22 100644
--- a/conveyor.conf
+++ b/conveyor.conf
@@ -10,12 +10,9 @@ include required("/stdlib/jdk/17/amazon.conf")
 // Import JavaFX JMODs.
 include required("/stdlib/jvm/javafx/from-jmods.conf")
 
-// Small tweaks e.g. enabling proxy detection (https://conveyor.hydraulic.dev/2/stdlib/jvm-clients/)
-include required("/stdlib/jvm/enhancements/client/v1.conf")
-
 // Set some version keys by evaluating Maven expressions.
-include "#!=app.version mvn -q help:evaluate -Dexpression=project.version -DforceStdout"
-include "#!=javafx.version mvn -q help:evaluate -Dexpression=openjfx.version -DforceStdout"
+include "#!=app.version ./mvnw -q help:evaluate -Dexpression=project.version -DforceStdout"
+include "#!=javafx.version ./mvnw -q help:evaluate -Dexpression=openjfx.version -DforceStdout"
 
 app {
   display-name = AtlantaFX Sampler
@@ -33,7 +30,7 @@ app {
 
   jvm {
     gui.main-class = atlantafx.sampler.Launcher
-    modules = [ java.logging, jdk.localedata, java.desktop, java.prefs, javafx.controls, javafx.swing, javafx.web ]
+    modules += jdk.zipfs   // Needed for the jar: protocol to work via nio.
   }
 
   // Force an update check on each launch, because if the user is running the app it's quite likely to be due to a new release.
@@ -48,4 +45,4 @@ app {
   }
 }
 
-conveyor.compatibility-level = 6
+conveyor.compatibility-level = 9
diff --git a/ms-store.conveyor.conf b/ms-store.conveyor.conf
new file mode 100644
index 0000000..7cfd1c8
--- /dev/null
+++ b/ms-store.conveyor.conf
@@ -0,0 +1,21 @@
+// Use as: "conveyor -f ms-store.conveyor.conf make ms-store-release" but only if you have the credentials.
+
+include required("conveyor.conf")
+
+app {
+  // Can't use the same name for the out-of-store version as in-store version.
+  display-name = AtlantaFX
+  fsname = atlantafx
+
+  windows {
+    store {
+      identity-name = "28744MikeHearn.AtlantaFX"
+      publisher = "CN=19FFBD70-DE2C-4F30-853A-36D0DD2E39DD"
+      publisher-display-name = "Mike Hearn"
+      store-id = 9PDK4KSVKVVS
+      include required("ms-store-creds.conf")
+    }
+
+    certificate = "self signed by "${app.windows.store.publisher}
+  }
+}