From 9c74494f09edaa9cb40f07459064d67cf13cbd04 Mon Sep 17 00:00:00 2001
From: asvitkine <alexei.svitkine@gmail.com>
Date: Mon, 10 Jul 2023 07:57:15 -0400
Subject: [PATCH 1/2] Revert "Install4J updates (#11759)"

This reverts commit b2a74c946c5b7a8c793db48eeff9a4e3dbe07d96.
---
 game-app/game-headed/build.install4j | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/game-app/game-headed/build.install4j b/game-app/game-headed/build.install4j
index 96adcc7a531..5a0950be66c 100644
--- a/game-app/game-headed/build.install4j
+++ b/game-app/game-headed/build.install4j
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="10.0.6" transformSequenceNumber="10">
+<install4j version="9.0.6" transformSequenceNumber="9">
   <directoryPresets config=".triplea-root" />
   <application name="TripleA" applicationId="5251-3669-9623-1649" mediaDir="build/releases" mediaFilePattern="${compiler:sys.fullName}_${compiler:sys.version}_${compiler:sys.platform}" compression="9" lzmaCompression="true" pack200Compression="true" createChecksums="false" shortName="TripleA" publisher="TripleA Developer Team" publisherWeb="https://triplea-game.org" version="${compiler:sys.version}" allPathsRelative="true" autoSave="true" convertDotsToUnderscores="false" macVolumeId="af9346379363d40e" javaMinVersion="11" jdkMode="jdk">
-    <jreBundles jdkProviderId="AdoptOpenJDK" release="11/jdk-11.0.19+7" />
+    <jreBundles jdkProviderId="AdoptOpenJDK" release="11/jdk-11.0.9.1+1" />
   </application>
-  <files>
+  <files preserveSymlinks="false">
     <mountPoints>
       <mountPoint id="28" location="assets" />
       <mountPoint id="23" location="bin" />
@@ -17,7 +17,7 @@
     </entries>
   </files>
   <launchers>
-    <launcher name="TripleA" id="33" menuName="TripleA-${compiler:sys.version}">
+    <launcher name="TripleA" id="33" menuName="TripleA-${compiler:sys.version}" macStaticAssociationsForInstallers="true">
       <executable name="TripleA" iconSet="true" stderrMode="append" executableMode="gui" checkConsoleParameter="true" dpiAware="true">
         <versionInfo internalName="TripleA" productName="TripleA Game" />
       </executable>
@@ -32,6 +32,10 @@
           <scanDirectory location="bin" failOnError="false" />
         </classPath>
       </java>
+      <macStaticAssociationActions mode="selected">
+        <id>554</id>
+        <id>263</id>
+      </macStaticAssociationActions>
       <vmOptionsFile mode="none" overwriteMode="3" />
       <iconImageFiles>
         <file path="./assets/icons/triplea_icon_16_16.png" />
@@ -41,10 +45,6 @@
         <file path="./assets/icons/triplea_icon_128_128.png" />
         <file path="./assets/icons/triplea_icon_256_256.png" />
       </iconImageFiles>
-      <macStaticAssociations>
-        <fileAssociation extension="tsvg" description="TripleA Savegame" />
-        <urlHandler scheme="triplea" />
-      </macStaticAssociations>
     </launcher>
   </launchers>
   <installerGui suggestPreviousLocations="false">
@@ -801,13 +801,13 @@ return true;</property>
     </styles>
   </installerGui>
   <mediaSets>
-    <windows name="Windows 32 bit" id="90" mediaFileName="${compiler:sys.fullName}_${compiler:sys.version}_windows-32bit" architecture="32">
+    <windows name="Windows 32 bit" id="90" mediaFileName="${compiler:sys.fullName}_${compiler:sys.version}_windows-32bit" jreBitType="32">
       <jreBundle usePack200="false" jreBundleSource="preCreated" includedJre="build/assets/install4j/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.4_11.tar.gz" manualJreEntry="true" bundleUrl="https://raw.githubusercontent.com/triplea-game/assets/master/install4j/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.4_11.tar.gz" directDownload="true" />
     </windows>
-    <windows name="Windows 64 bit" id="87" mediaFileName="${compiler:sys.fullName}_${compiler:sys.version}_windows-64bit" architecture="64">
+    <windows name="Windows 64 bit" id="87" mediaFileName="${compiler:sys.fullName}_${compiler:sys.version}_windows-64bit">
       <jreBundle usePack200="false" directDownload="true" />
     </windows>
-    <macosArchive name="macOS Single Bundle Archive" id="557" architecture="universal" launcherId="33" />
+    <macosArchive name="macOS Single Bundle Archive" id="557" launcherId="33" />
     <unixInstaller name="Unix" id="36">
       <jreBundle usePack200="false" directDownload="true" installOnlyIfNecessary="true" />
     </unixInstaller>

From 30e2c5822d6766bc37ed49600f56c1ddb268fef5 Mon Sep 17 00:00:00 2001
From: asvitkine <alexei.svitkine@gmail.com>
Date: Mon, 10 Jul 2023 07:57:41 -0400
Subject: [PATCH 2/2] Bump installer jdk version to 11/jdk-11.0.19+7.

---
 game-app/game-headed/build.install4j | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game-app/game-headed/build.install4j b/game-app/game-headed/build.install4j
index 5a0950be66c..a6ed55794c1 100644
--- a/game-app/game-headed/build.install4j
+++ b/game-app/game-headed/build.install4j
@@ -2,7 +2,7 @@
 <install4j version="9.0.6" transformSequenceNumber="9">
   <directoryPresets config=".triplea-root" />
   <application name="TripleA" applicationId="5251-3669-9623-1649" mediaDir="build/releases" mediaFilePattern="${compiler:sys.fullName}_${compiler:sys.version}_${compiler:sys.platform}" compression="9" lzmaCompression="true" pack200Compression="true" createChecksums="false" shortName="TripleA" publisher="TripleA Developer Team" publisherWeb="https://triplea-game.org" version="${compiler:sys.version}" allPathsRelative="true" autoSave="true" convertDotsToUnderscores="false" macVolumeId="af9346379363d40e" javaMinVersion="11" jdkMode="jdk">
-    <jreBundles jdkProviderId="AdoptOpenJDK" release="11/jdk-11.0.9.1+1" />
+    <jreBundles jdkProviderId="AdoptOpenJDK" release="11/jdk-11.0.19+7" />
   </application>
   <files preserveSymlinks="false">
     <mountPoints>