From fb7cd435d9f8a2cd169792b2b8840ef8b36c7fdc Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Wed, 28 Jun 2023 11:13:48 +0200
Subject: [PATCH] Update install4j for Java 17

---
 .gitignore                                          |   2 +-
 install4j/{22.02 => 23.xx}/.gitignore               |   1 -
 install4j/{22.02 => 23.xx}/macOS_resources/DS_Store | Bin
 .../macOS_resources/macOS_installer_background.png  | Bin
 .../macOS_resources/macOS_installer_background.psd  | Bin
 .../openrocket-23.xx.install4j}                     |   6 +++---
 6 files changed, 4 insertions(+), 5 deletions(-)
 rename install4j/{22.02 => 23.xx}/.gitignore (86%)
 rename install4j/{22.02 => 23.xx}/macOS_resources/DS_Store (100%)
 rename install4j/{22.02 => 23.xx}/macOS_resources/macOS_installer_background.png (100%)
 rename install4j/{22.02 => 23.xx}/macOS_resources/macOS_installer_background.psd (100%)
 rename install4j/{22.02/openrocket-22.02.install4j => 23.xx/openrocket-23.xx.install4j} (99%)

diff --git a/.gitignore b/.gitignore
index 11a712b87..d7052274e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,7 +47,7 @@
 # https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
 
 # User-specific stuff:
-#.idea/workspace.xml
+.idea/workspace.xml
 .idea/tasks.xml
 .idea/shelf
 .idea/dictionaries
diff --git a/install4j/22.02/.gitignore b/install4j/23.xx/.gitignore
similarity index 86%
rename from install4j/22.02/.gitignore
rename to install4j/23.xx/.gitignore
index e5a57839b..60eadae4b 100644
--- a/install4j/22.02/.gitignore
+++ b/install4j/23.xx/.gitignore
@@ -20,4 +20,3 @@ media/
 .DS_Store
 
 code_signing/
-openrocket-22.xx.install4j~
diff --git a/install4j/22.02/macOS_resources/DS_Store b/install4j/23.xx/macOS_resources/DS_Store
similarity index 100%
rename from install4j/22.02/macOS_resources/DS_Store
rename to install4j/23.xx/macOS_resources/DS_Store
diff --git a/install4j/22.02/macOS_resources/macOS_installer_background.png b/install4j/23.xx/macOS_resources/macOS_installer_background.png
similarity index 100%
rename from install4j/22.02/macOS_resources/macOS_installer_background.png
rename to install4j/23.xx/macOS_resources/macOS_installer_background.png
diff --git a/install4j/22.02/macOS_resources/macOS_installer_background.psd b/install4j/23.xx/macOS_resources/macOS_installer_background.psd
similarity index 100%
rename from install4j/22.02/macOS_resources/macOS_installer_background.psd
rename to install4j/23.xx/macOS_resources/macOS_installer_background.psd
diff --git a/install4j/22.02/openrocket-22.02.install4j b/install4j/23.xx/openrocket-23.xx.install4j
similarity index 99%
rename from install4j/22.02/openrocket-22.02.install4j
rename to install4j/23.xx/openrocket-23.xx.install4j
index f3b51e829..10a55f19a 100644
--- a/install4j/22.02/openrocket-22.02.install4j
+++ b/install4j/23.xx/openrocket-23.xx.install4j
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="10.0.4" transformSequenceNumber="10">
   <directoryPresets config="../../core/resources/pix/icon" />
-  <application name="OpenRocket" applicationId="8434-9327-1469-6373" mediaDir="media" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.02" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11" javaMaxVersion="11" jdkMode="jdk" jdkName="JDK 11.0">
+  <application name="OpenRocket" applicationId="8434-9327-1469-6373" mediaDir="media" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="23.xx" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="17" javaMaxVersion="17" jdkMode="jdk" jdkName="JDK 11.0">
     <codeSigning macEnabled="true" macPkcs12File="./code_signing/OpenRocket_macOS.p12" windowsEnabled="true" windowsPkcs12File="./code_signing/OpenRocket_Windows.pfx" macNotarize="true" appleId="sibo.vangool@hotmail.com" />
-    <jreBundles jdkProviderId="Liberica" release="11/11.0.17+7">
+    <jreBundles jdkProviderId="Liberica" release="17/17.0.7+7">
       <modules>
         <defaultModules set="jre" />
         <module name="java.scripting" />
@@ -19,7 +19,7 @@
     </entries>
   </files>
   <launchers>
-    <launcher name="OpenRocket 22.02" id="59" icnsFile="../../core/resources/pix/icon/icon-macos.icns">
+    <launcher name="OpenRocket 23.xx" id="59" icnsFile="../../core/resources/pix/icon/icon-macos.icns">
       <executable name="OpenRocket" iconSet="true" iconFile="../../core/resources/pix/icon/icon-windows.ico" executableDir="." executableMode="gui">
         <versionInfo include="true" fileDescription="A model rocket flight-trajectory simulator." legalCopyright="Copyright 2007-2023 Sampo Niskanen and Others" internalName="${compiler:sys.shortName} ${compiler:sys.version}" />
       </executable>