From 11a0d0947e925b0ab0a7f1495bcf44bf480a953d Mon Sep 17 00:00:00 2001
From: David Finol <davidmfinol@gmail.com>
Date: Mon, 15 Nov 2021 11:12:37 -0600
Subject: [PATCH] Improve androidVersionCode parsing and application (#297)

---
 .../Versioning/VersionApplicator.cs           |   7 ++++++-
 dist/index.js                                 | Bin 14729727 -> 14729912 bytes
 dist/index.js.map                             | Bin 8949613 -> 8949826 bytes
 src/model/android-versioning.test.ts          |   6 +++++-
 src/model/android-versioning.ts               |   7 ++++++-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/VersionApplicator.cs b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/VersionApplicator.cs
index defb12dc..5a3c5d64 100644
--- a/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/VersionApplicator.cs
+++ b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/VersionApplicator.cs
@@ -15,7 +15,12 @@ namespace UnityBuilderAction.Versioning
     }
 
     public static void SetAndroidVersionCode(string androidVersionCode) {
-      PlayerSettings.Android.bundleVersionCode = Int32.Parse(androidVersionCode);
+      int bundleVersionCode = Int32.Parse(androidVersionCode);
+      if (bundleVersionCode <= 0) {
+        return;
+      }
+	  
+      PlayerSettings.Android.bundleVersionCode = bundleVersionCode;
     }
 
     static void Apply(string version)
diff --git a/dist/index.js b/dist/index.js
index 07e912319ee231294fb5e65ced615c321e73d9fb..05579577f1bc829ae0f63789a18d8fc66e0c327d 100644
GIT binary patch
delta 1047
zcmXZV*<Va?0EY2TYKk(pNYhw;5o1X+B3t%d_ARo`)H$ZZIA_c`MG`TRof>4%nk7pK
zW#9LG-<La={0BTfTzqey_u~ES_lMOK_`@nxOCZG>QS$4D-4tq5HC46+?B=NAN>iFM
zRrcwMrYfpi=!VZ_$nG4W=t7qbVQ3;QH~Zh77cX>8xKzofDU$dfMTREHLeJE)Jd#i~
zL!`^X<@I_LSxN}R#zcoWlFi|PqVmWp)$%haIMI>hcUlXb)*#eEFhXELD8f)1br6mS
z)P))KP#+D@5RDLt#%O{lG(|Klh{4~lW@wHUXbFK>v_fmdp$*!?hIVL=4(Nz@bV35`
zaG*01(FI+Rgl_1L9_Wc)NJek;L0|Mke+<At48mXx!B7mtaEw3-Mq(63V+_V(9L8e;
zCSnpMBNbCH6=|4;>6n3;n1$JJ!i98XK!S`pa3d26=3*W^m=6^iyjTDqbQs7&HWp$L
za<CY=Sb{t(#WLh$Iaa`rl_<a}6k;{jU@g{RJvLw?HeoZ0P>cY!U@Nwv1lzF#JFyG9
zu?KrmihbCR12~97IE*qJ!BHH;ag^f(PT~|!qXLyUgDRZGIh;o|YH$G;aS4}k1y^wm
z*Kq?kaSOL`2X}D~_wfJ^@d%Ic1W)k{&+!5;@d~f;25<2W@9_a2@d=;t1z+*4+G+h>
GTJ{GgJ9`EI

delta 930
zcmWm7Rd)^m007W4W7A#VOm}alySqE4yJouc!{o#;Jvq&om}a`W^Bg~f>)}4%j8(z#
zzrkR5T3jG0F*7VVzHDq*dQ8NhkkII;s9+#6ArKit7DCBNHo^!eJ2}WnE^?EHyyPQ4
z1t>@%3R8rl6r(r+A}GQCuOy`?O&Q8kj`CEXB9*926{=E=>eQenwWv)L(bOS^y40gS
z4QNOs8q<WPG^05!Xh|zt(}uRRqdgtyNGCeeg|2j?J3Z)0FM895zVxF%0~p941~Y_M
zhBA!dj9?_A7|j^QGLG>~U?P*4%oL^)$28)Z&J1QUi`mR!F7uer0v57}#Vlbd%UI3|
zf~;f}t4UxDYgxy7Hn5RIHnEv4Y$b_pY-b0_>|__a*~4D;v7ZzUaF9bB<_Jeg<rv2~
z!AVYWnlqf`9BG{A0_j}j5|_C`23NVpb#8EzTioUjcgf@)_j$lW9`TqbJmneBdBICw
h@tQZh<sI+&z(+punJ;|h8{hfCPkvnqME*`m{Rf`@6e0is

diff --git a/dist/index.js.map b/dist/index.js.map
index 02f943ac6070b7df3b0b22d647bfb03d11f8570c..33720f2b9dccaada4916fb5df19e83bc0f380c3b 100644
GIT binary patch
delta 734
zcmXZayHgWU7{=i_VGW3gsECMyM@8cWCB|D46+!We67WL2V_?^?6841b23ZjdqNb%g
zo#Rk5Ryb*_{7Yc0ow2jXFyjxjc#8LXt9R!6^?AYg@nyj%EQvo+z1$-V-TpmN6AU@Z
zu|m2lCK`3;w?HsCVC7s}IkuCQu9r)BR@#@gD_zTzo|3Io6aV_@Ht8yva?G5vP5J*Q
zhm~nbcSPkgrgW4ihb)=OW;3>B>hRY<z0P)vN)guME22RcMn!dLH7d%YA`(7REXM@`
zsDObD2%-{I*obOuLJc;f7F$q<t=NX`sK*X8U?&=}3r*OKJ!nP?_CjJG_TvCraS(?P
z!eJc2Q5-`Xj^hN{5ynYGa0;ifw&^U+A&MB{IFAdshz?vrC%SMMSI~{CxQ6Svft$F6
z9^A$q^df;i^y4n>;XWQ<07*Q=BRs|vJjF9S#~@xHg&_>XgoT$#V+1x{VH6pR!GS^+
z<H*5<hdd_m8k41R++R`p_p;9yEcsQX`Q)4-*7D$bE+!UzyulRSVj44ehXQ8t9&`AB
NkN8wdEEZdS{slS(RyP0u

delta 587
zcmWm8%QMsg007|mv5Hc8^gyMs=%J7bZA1vY-=!BxMGs03w$Q58{t0f4aWv!B%sLnc
ze?cdA<LvC(=kVRX<(b*g`k&cQ>~FA9mt3e1f|S(is;b0dBp`)ULZq>Ut)!E|Hnx+=
z4tBDOEV9WVm)-1PFZ;+Np91!CfP)lrh{F_7ObKC1DWjYt9OW3tso(@BsbuqC%_(X)
z%^A*8OC9x`Bf@zaXygJ-G;@&_T501F?R3z|Wv+0QYh33BH@U@a?r@iT+~)xg>EaQO
zdBRhk(M=D}>E#7|yyO+H>1Tj9yyYG58DxkLd}NqUeC7*Z8DTWJ7>TY9P5)boXC#;6
mvEE>MW-gkZ2+v3P#&^aTXM!KZnB*tFh%?3SWOzPNxb`1t*#NNs

diff --git a/src/model/android-versioning.test.ts b/src/model/android-versioning.test.ts
index 9617f557..1951549d 100644
--- a/src/model/android-versioning.test.ts
+++ b/src/model/android-versioning.test.ts
@@ -2,6 +2,10 @@ import AndroidVersioning from './android-versioning';
 
 describe('Android Versioning', () => {
   describe('versionToVersionCode', () => {
+    it('defaults to 0 when versioning strategy is none', () => {
+      expect(AndroidVersioning.versionToVersionCode('none')).toBe(0);
+    });
+
     it('defaults to 1 when version is not a valid semver', () => {
       expect(AndroidVersioning.versionToVersionCode('abcd')).toBe(1);
     });
@@ -11,7 +15,7 @@ describe('Android Versioning', () => {
     });
 
     it('throw when generated version code is too large', () => {
-      expect(() => AndroidVersioning.versionToVersionCode('1234.0.0')).toThrow();
+      expect(() => AndroidVersioning.versionToVersionCode('2050.0.0')).toThrow();
     });
   });
 
diff --git a/src/model/android-versioning.ts b/src/model/android-versioning.ts
index 1024fd83..e5fd464a 100644
--- a/src/model/android-versioning.ts
+++ b/src/model/android-versioning.ts
@@ -10,6 +10,11 @@ export default class AndroidVersioning {
   }
 
   static versionToVersionCode(version) {
+    if (version === 'none') {
+      core.info(`Versioning strategy is set to ${version}, so android version code should not be applied.`);
+      return 0;
+    }
+
     const parsedVersion = semver.parse(version);
 
     if (!parsedVersion) {
@@ -21,7 +26,7 @@ export default class AndroidVersioning {
     // Allow for 3 patch digits, 3 minor digits and 3 major digits.
     const versionCode = parsedVersion.major * 1000000 + parsedVersion.minor * 1000 + parsedVersion.patch;
 
-    if (versionCode >= 1000000000) {
+    if (versionCode >= 2050000000) {
       throw new Error(
         `Generated versionCode ${versionCode} is dangerously close to the maximum allowed number 2100000000. Consider a different versioning scheme to be able to continue updating your application.`,
       );