From 96f8710d81213c34089f897498085051187c2d42 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Mon, 9 Jan 2023 16:52:27 +0100
Subject: [PATCH] Add RC to release notes and update info retriever

---
 ReleaseNotes.md                               |   4 ++
 core/resources/build.properties               |   2 +-
 .../communication/UpdateInfoRetriever.java    |   1 +
 .../communication/UpdateInfoTest.java         |  51 ++++++++++++++++++
 install4j/22.02/macOS_resources/DS_Store      | Bin 10244 -> 10244 bytes
 install4j/22.02/openrocket-22.02.install4j    |   2 +-
 6 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 823d24092..31ad1d18e 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -13,6 +13,10 @@ Release Notes
 
 </div>
 
+<div id="22.02.RC1">
+
+</div>
+
 <div id="22.02.beta.05">
 
 OpenRocket 22.02.beta.05 (2022-09-28)
diff --git a/core/resources/build.properties b/core/resources/build.properties
index 9a47045d2..acda27846 100644
--- a/core/resources/build.properties
+++ b/core/resources/build.properties
@@ -1,6 +1,6 @@
 
 # The OpenRocket build version
-build.version=22.02.RC1
+build.version=22.02.RC.01
 
 # The copyright year for the build. Displayed in the about dialog.
 # Will show as Copyright 2013-${build.copyright}
diff --git a/core/src/net/sf/openrocket/communication/UpdateInfoRetriever.java b/core/src/net/sf/openrocket/communication/UpdateInfoRetriever.java
index d587f1c1c..4437340f0 100644
--- a/core/src/net/sf/openrocket/communication/UpdateInfoRetriever.java
+++ b/core/src/net/sf/openrocket/communication/UpdateInfoRetriever.java
@@ -36,6 +36,7 @@ public class UpdateInfoRetriever {
 	private static final Map<String, Integer> devTags = Stream.of(new Object[][] {
 			{ "alpha", 1 },
 			{ "beta", 2 },
+			{ "RC", 3 },	// Release Candidate
 	}).collect(Collectors.toMap(c -> (String) c[0], c -> (Integer) c[1]));
 
 	/* Enum for the current build version. Values:
diff --git a/core/test/net/sf/openrocket/communication/UpdateInfoTest.java b/core/test/net/sf/openrocket/communication/UpdateInfoTest.java
index 3f13cfb52..95bf1e5ba 100644
--- a/core/test/net/sf/openrocket/communication/UpdateInfoTest.java
+++ b/core/test/net/sf/openrocket/communication/UpdateInfoTest.java
@@ -92,6 +92,12 @@ public class UpdateInfoTest extends BaseTestCase {
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.beta.01", "22.beta.01"));
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.beta.02", "22.beta.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.RC.01", "22.RC.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.LATEST,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.RC.01", "22.RC.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.RC.02", "22.RC.01"));
 
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.alpha.01", "22.02.alpha.02"));
@@ -105,6 +111,12 @@ public class UpdateInfoTest extends BaseTestCase {
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.beta.01", "22.02.beta.01"));
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.beta.02", "22.02.beta.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.RC.01", "22.02.RC.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.RC.01", "22.02.RC.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.RC.02", "22.02.RC.01"));
 
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.01", "22.02.beta.02"));
@@ -112,12 +124,36 @@ public class UpdateInfoTest extends BaseTestCase {
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.01", "22.02.beta.01"));
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.02", "22.02.beta.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.01", "22.02.RC.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.01", "22.02.RC.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.02", "22.02.RC.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.01", "22.02.RC.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.01", "22.02.RC.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.02", "22.02.RC.01"));
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.01", "22.02.alpha.02"));
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.01", "22.02.alpha.01"));
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.02", "22.02.alpha.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02.alpha.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02.alpha.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.02", "22.02.alpha.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02.beta.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02.beta.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.02", "22.02.beta.01"));
 
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.01", "22"));
@@ -149,6 +185,21 @@ public class UpdateInfoTest extends BaseTestCase {
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.01", "22.02.02"));
 
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.03"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02.02"));
+
 
 		// Test bogus releases
 		assertExceptionCompareLatest("22.02.gamma.01", "22.02");
diff --git a/install4j/22.02/macOS_resources/DS_Store b/install4j/22.02/macOS_resources/DS_Store
index 7b4b11a181bb8cee06d80072eff574e8cc6182db..a572a3aad860f6f1a96e4b2961d1dae3294cef14 100755
GIT binary patch
delta 491
zcmZ{gJ4*vW6ot>stgcC+yBo5Kc`e39K?xF4SZGjD1i?pAs30VwC<qCPg?5Vs5v<JM
zqp-*iuu#{+LL`EvAc8+YEP|zlHWpcDbPF5LaOZxUduAA>G*y~9uW6K(`I|P)AN4jq
zqVN0X@*5lZ!pic{Hm~V1|D;ZyAw-_}fU!e-&Ydwv6xRi~-{{U{3&p~6Je`vfAfBH4
z1vH@xgP6uD*0GC2oZ%YxctQ;ys1ub0NSH+EC#^G;`Ix~%EX<-T#yVLKe-B0}OF5dE
zA<gz;vAAY8$XgXHaj+hzdx~?^dPzH^MH+!l(d(}3R$8P3P*I8oTv1*Q&+}yHbTKC^
z8NoYnBj&1%SwNKu5Nfc1gvXlTw8y&OO^*%1S&svPmprxvR~S#2eW|1(j{Z{<fBY(b
zpF>1{VEn}FZ=MxnDQW?4l)so;&S+$Tkalhdf<X&?V)Y{Nv(I2yvU3|9Cl~fBaa8L|
M;m78~f1jn$Z?F4hH~;_u

delta 1381
zcmc&!OH31C5dQvlD-SDuf+$!ET#VWW)p%%#@@N7?NTCIzNTN%-meO_?+7g48M#I4v
z69emA;=vd_NT`qKiNqc`a=-+GCI(IP;KhpvbpEo%dccDRoz49F&G*mFKQp_tvjejO
zi<@Sh;fVUlJXn1}Os7RTCUwrJ1D4zSFPZIQVk8kuE7NkcHzmfTj$~ZSsGF9<h9Oyz
zCH1ZCXm!w{p8$z|LN!@$uzmS?Yd0H)oy~KWRvlpM7b9^wt7OKVJpoRa$;OlWm7M{w
zA0&?8q$G!wNJ7fGd_K3==MHtXx>8~!7<NZfvAL<H9CzDz|3E55;5Jb0j7*o9;=L-M
zT$PiG7|nnZX!H1oGg3O^568!pbE4d>C`td0hyTx~q6VkoKoFCVpq{tY<XrI4<%YMo
zhR}spxR8Q~2)Tu6CrVZfCLDwj{Y5?w8CfXEU>r{LAOI`2lk$`$<=IKfvwKqYyce*6
zd4O7~&dNK$RW;fhPF$qJXK)ku@E9*pz#DwT7OP-3*2oUAW_FC7WT)5}*28+)S=J}K
z5?-q#c85+_$zQXFS<U*Gq9lwJyo-X_J2%y$v+r4|ThiqW#4rXFJ4tx2W|yUpDvjGI
zgKUS!?Osr^9+<h`9^ff`Fa^>z(l4Zy#0z@l@N$$8iAJDhjl9cj<sm=**Z$nICV|_f
zz{mAK8)+ZuC@GHv^5`f$H$D1%{SJ556aS5h<a><5U5O_pzsKV-LTx{AE4M=Q7JYFG
zCITcpv_OlU9^+yloYb(H@G^zs(oT3*<8@BJTTG1n2``lV2`_5cLimG*t%M8PxC=Hi
zR<#W$VY3#<OZc637+VI0G;ATvo5{tx4BXYLtMwzH%VhF8@ReFZA^7XoIsZB@N-N*j
vATefD2W_<mH)tmE>y5oEU*Y^N<P@5V1PxD?rsO|NPV?`7k$*Zl^L6r1>Af8z

diff --git a/install4j/22.02/openrocket-22.02.install4j b/install4j/22.02/openrocket-22.02.install4j
index d31546c6c..1ac751328 100644
--- a/install4j/22.02/openrocket-22.02.install4j
+++ b/install4j/22.02/openrocket-22.02.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="10.0.4" transformSequenceNumber="10">
   <directoryPresets config="../../core/resources-src/pix/icon" />
-  <application name="OpenRocket.RC1" 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.RC1" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11" javaMaxVersion="11" jdkMode="jdk" jdkName="JDK 11.0">
+  <application name="OpenRocket 22.02.RC.01" 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.RC.01" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11" javaMaxVersion="11" 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">
       <modules>