From 6338b774213816499dc791549ce38a846b8b0cc5 Mon Sep 17 00:00:00 2001 From: James Barr Date: Tue, 2 Apr 2024 14:58:54 -0700 Subject: [PATCH] Fix okbuck manifest merger cli breaking changes --- .../util/manifest/manifest-merger-cli.jar | Bin 5251 -> 5209 bytes manifest-merger-cli/build.gradle | 2 +- .../okbuck/manifmerger/ManifestMergerCli.java | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/resources/com/uber/okbuck/core/util/manifest/manifest-merger-cli.jar b/buildSrc/src/main/resources/com/uber/okbuck/core/util/manifest/manifest-merger-cli.jar index ab5b4f080372842b086892342bd19a03fea7d072..18e52802329477b6ba610e5ba3277d7743cdf594 100644 GIT binary patch literal 5209 zcmai&cRXC%-o_EZ3?X_aT8Jp4k04Pe7%c`Fy^P*P8zmBn8l7Nt5-sZJqa;FP^cK;( zQ6fR~5+X0}eeb!s=RNn_-`;EOwLhQddDdF{ueHBA&?|&MJUkK-yg~10aJ-8mxa=+p zaM3hX^b`cuv>?J)@O1u7*mWYM`r<+`e$i-t7iubKsXE6jS+whRP>v|?b)5|ZG-_{nK5MsHriKVb0hYrk0TADbk+7$e+V{@?z7*Ia&xOO3ac&7;2+ zUjJR_=49oKaQa(4%U|eSEL|OJU2GoN{l#3XYPxEX7n5Xh)3yc7P)Z=Nto+NHCc7Nc}q9pl1OIR=Rkf5qDx~lEQbcf_kli(`x2?8|) zBr!Nd{AhCZ#=|Sz!Q8WVYPnr9A*kz#+144eTRzPhn`{nJ(;Jervl|JUu2LN0`vI@3 z1g1qN%AVXC4A`4HdUxu-H_~k0vP1V&W&ag1!lUQ8q?eyNlbb3S*Omb`e%i2I&m6vE z3Yg!M#~zUm1+zzVQt+IqVx=i)TDTVD8>mX)h>AdH^eLIj3 zmt%ca6Jp+6#m4TZ6EPpr*?MsU(NB_gsu+HmVxM#!YbzYLS_g7sf6>LwH|^XzHWxWH z#XqOWc`<3X^xhAU(~G%*J7NnAj%ra`U`)^;Ps=1z6iVB*?y*ZzO;k(i+HCXRjVLFe z(28HmvlO4vHC_6KsL9 zBlb<Jo{jq=t*vgm%Xb1c!jiIP$I@eYSUz ztklhLAUr?@-Y6L*l&-kHZ_y44#YpR{);T5Q%hLj+GSdB?f?DX~$V53^@uipo_Tk62 zSt6#%L~1wNDVbrmNsFB-E}P;k5xo0fh(_#3`Uw%)cI$dkp&DE)J#Pl*cp1i{1+q)I zDBr3?z045oE@p#TJGnTAt$l6UI9Q}RA9CcfXSEy$9pqYuA$8rfUw(yapmd@-y$zOU zg8i0*dCJG9$;3ps9-HtDP2KEcno(#gTanN=0w;OCMLrd2mN1qQ z=t2oF>+^cS5bPG$Rgex+cYWd_hN*_84NC_vlhm)iC<6K2ixLeDNQ6%-CNo8GcpM6#9kHpy4Foem9Re=oFaW1I0=#>TOw+ zvdz>eKx?TAPdt^8^KkDvLv)2{iuz0Oar|km+drS9zimL7#Do(MuWLU~5P#lOeiF3q zUSR=kGeZGgKWtJZ^XoyNfF$9xU))B8LywF&hSfuR9Fi4j!9C~RfQmGda)aW;5*i~V zr^(qL{E-WMLI%a@W0csVS(9Y4`-+NEW(M!*0O6k{`#-XeDbL)NxGi_Cn?8cjo>KBM({*Rxstv8@uZ^jPdL=2!2y7Zarm2XX zMSK`-<01rz$LV9a=AVWt3QLv zPG?owDv3}E(2n^QNl1N57gr7urP9stuB&e;d}Ijovp^JBh?G>7x7Qly$#qDBN_3*h zLZ|F2l?!!zO*TLpiBr;q!sgLnrXL=Zh;UuO`=2-|5jokDz;7P$Yv_1N!Quuc2YS;)g_)W=s(@DI1`kO-A@cS9?v#`*NT)_MqgzpVN`MEO zP5j0-4c1~@TG^M+i+5IVSPnP~)u);*8oIKdt7u+Wsk$GpNHM}iC08=U;U6uN%94y? z&IwA#8QdI(wGftf()vG3r}0nBPW)2Ji7%_k$D}SzHxLAW#T8=nt5R1Tm7Z35YGg?7 zD6Xlsx#hA%#j5|s&|fPL;g#9@#4jB+r75oo(_y~G^-6Nx)?~qGVG%yTr>l6&vhbQE zaW!&6waKGzmVLz}AZ8jE2c$X|z+?Oe7f-o_vd%{bt*TF$8}+FUZdtDXUZsn>qx7p~n&FLs-z^$#uq zzb@fWiZf2ro@b{s)!d2q_pLv)>E$#h2}6lC=I^`7fbq%Urjr~*E8pHiGe<$5pqk|t z-0s7uQfwDn&q`r87Ew8}gb$Sx3z(((v{KR>ht?ti4c|F3TQm^Kq_oO>;AX=CqFPW5ihy(O%bV!A&#ED5hyjQEDIyF|%-S*bvAR5V*Nt@ir7$&-#VL{eJC)le#V%R$tnmEr{g?&LMPj=63B=Wmy_u^LjF8b7JhNqeuQnkP&B7#C|d5 zZHKX?Cc!2Qeh99vTQz^6Hk~Di-tY}a*0oUWzMeev3_nZTU2}wcW8{}Z(|*C0xvwE$ zC;L2|8;|L~Hx?!zHM*Kah9oh1=qo!(X;g@&j7Q1nj_HH!JE%;aqjE~CZQj_A_7VBO z<>)?-3^2xq?*D9;R%v=;dx+~^#jr}_&PGS25xlo~4e2F@p$20W06nR){=oFEsTJz0 z00dWfwPBkNT37uZDl=r2e3R>n<$;ZovrY~__J=2_*?U1F)^Sxafp>~LKb1ZP^7O5s z&+*RR4v=&zZ+b*j*rm5}#stXA?9otQE6V%!XmAk84I9Mu($B_MG^?jq6q1d`Yewajpu_ zeNcuS4k8UbH&I{^=Uh^9Rr3~4 z*B}w_sqJUt=Cf?$*>R0liP1r(9_$E|zV4mO6Q8surt}UuQEGY-nchL3BO%N;kLJ)Z zeJ}?%eF%kvYvb|>RMPYU__K$OX~l zg0&Q^yNz$7bTNk{5V0q7->NY?jahe(x@>Llx^QHdCvTHVDgbt+plwC}?!c`~yBVMX!k%%IwBJqBXKBdu&3Kc?tX z1Z0Bx$6}*eA7yR42jBd<+da2wn0QCKU5yaXlwUk#*bBj`X!B=yuGiK2E`Dmno# z7bOH#fW2vTwBYbZXAHE*00W$y-qKnzRv1mrZY6gYA}Exby*n)L>dY;iZZ9gCz%KPk z*17Q7gyO*jWE!32gS#nO^_<*_clKJ$mQp-9hjM2wjM&Fx$tiEdzCfxfW5AN)Ck^Ef z9;;j4nX<=mxvwc3q+Q!LV-02&?K@3l ze_}d4h_}3DyK$B?-;tCQU^DFV*cxQl4mq388Cl$&xetigqa6&6OLp;?Q2S0$co9nu z&cTi?wmOVLMh?8h^4u;f$$dup>Y&WSg{x~!EniH+E2Xc1+opas?Gbr_eV2Ib#NJsJ z49{E0I-NMo1j|S}JyR@uP5AF^TeaPkJk zZL?(wfO$<6jA@#EN8{xS1nN-&tFU(aIFFZmXuLbT9cp1`*zfiMDr6xWmtz@%n4m`q zTfPm!ot?>z8NGi|XO3h`5=~lnp-OoYt3NWjo?{t};|!=MqWD3^1h_axZ~|hku5m~U zz3+El%gZJ%Pek|k+7d)zrEVB3NO^p!DCmW|KY-490%bg4^ge;j+9E+bFm4q}I-_6- z>U65sHl#FcL|e>pry7qvZ{+8C7 zI&)B*90W=8^NOK>dAQ|SU`)(8s}^CUCvU=%`jZzhMf&hx4q8NR?tD3mA=^YnF;c@X zYBoS_RScC2#_PKSTd1)v&II~KIRGIL7Qxo0G4N0_z?1M^71=$z1*)gm=}<+#^$G-w z48^vb!RMp2BzAYj9~>FqO;SYZ7pFI#Dkg^_lSk8ixEQ_gNhfmOZj5$|79_XC?~vAD zRBGCkXCH4KxEky&+e)z19hx^}-;!;|@!zZt<=VGA25W1!;jXuGCVE&GP;{RB^oz(j zxcK=l+aCsH<~Ac)+HgN*wO-%a?^B;=zracO1TQa1J`N6j?`af*HQK>&CT&n+xye?_bKk9Pgm5bpe_xU@=B^&xjT{-~xzmcN9vt5#+ zf7wKTxBVYC`aAa}H~N>`>Mz{CQ=~s9{h1>DGb=wh`@bap2d1P0y-IW$LVR)cUPK_N HF5mtKPm~-f literal 5251 zcmai&cT`i&qQzCDBPEcCfJ*P7inO58LJ6UFun?q4mnH-$(z_HXh9WKW-V#8N&^t&G zgn$s5ASH@`g8Jay_wMI)-TU2r*36l+*4}$&&YwSB7|BJdbLS{1&Y3EJ;O9`Q{8Y+S{w4tIT=XC$YxR3ALi8?jBI~`2F8{vxD8cdYO0a&2X>#Wy4nOSbcAo?VYLRh@WH~q(WOX6Tm0{hP^+tJMg4kWJI z_j$g6e$qOj5T_jDl9C@r=6*o-*U@kMamS0NN4Iu${+H|h={frkXC5zv&Evl{(*JIB zbwqesJN~Vo?ceyFty~;zooyc5{hPhmt)3UwpKh|meeRs(f62nndTcyA;s0Bu?BpO~ z?PTTQQD{!-&$RCKs~!Ks)?3PQ5X)wZiM<0@uI&J%(E})q0n_K#Bx1eE9jtuRhIXiy z9`rKz#&6Hi-Xh`UJ&KGCv9^$kp=e9u#b|Hcgm0lElAGOGiz?=N;HdBHyt}BY6~=F= zxCMWt@1k~*i^mJdMdYu;HpSaNmyuN@rdpzYVjx$)vFKgo9?3~f=ykt6F3Y}7iz7zq z_$6n`+Xr`ga@Lkc_u`+NU_;xV6B+54P6|VF{KPJ}4jc)M|7?i$Q9YIh1f)i^cQ5uI zAr%kl5Fv*TPb_;xAD-mL9x4od&zWx}h}!sn=(tU|f3d%+i=a$AY6uPVvIhOcha?~M zh5ULGIB+C-r9E-4hLv@1@fy>Ire)&oWn%lYPd*Yqb?S5ajtqP35QI@1OQ!AJZUVKm z2m?lKg@asHb+ntBUoFovgFE9P9k!o~_lt^7qC>h?Cuu)L26W&?v?^znRz434p@WP? z2;Jjr4}tGJPvC8K0Kh?22J@bm;9s9>PH?{z8K^eeDU|{;G;PdzCmwU)s4|TGKIGK^ zDmYg}s8yATz>9W2GvOCaund!wTqn83_mU%Te6$UjW?EyYTBNXFg1@{1*gbe9v;c@^ zi2iY&OF#3$GQ!%`fU~+uCQntlg{ygXNO>x+s&{#6+R<0WaDbZ2oL`eUt$ny%&2b{S z)4U#wx#bd`H(aPhgIF^#FyP3?NH9%1#y%-bj3g6!PvYkYd8k5qdDv-fTg}c&iP`x2 zy9>y&24k4 z^KQR><~uy}94p8+jcRbqn9Ypb7=MCZ>OtF7mJYLBcOlYMieH!p9MBrjG21?u_wrUN ziH3FyJgP|_3D1V1`e|^Qb{%Dg z1mtHlPs#~H>F#o*_^*gqAeE5koT zusL>I($#gI(gNqzk(W?8qfw?oN=B}(HczHPO3}49{G%168gDbv)$`YfH6FaLYjmJX zuC*4Zk87;k0s+l>OU7uM%@hHx?;=0n(=x5^SZaT2h~E zVAxetJf{7=@HrID)=^S&OF|rl8Ia8fGfjqk;ilqe;=bGA+gkcTxS6T-nPe!Bvgc67 zi%)PG)$$~~fxUDM1k99VpP+;UlbEQO6Ud#Uyjg7%qRYwcuE+B(205taiqXbM#_=-& z$sdgwhnYKEZ?V)%97m(9w(n?hOk8t-^IbKs)Qx4{tb|?9S19V)f08LJU}z17aA2)>9tjm*>AwC3ySVl|@6Zn$agP?Ihz(lWE}zt7Lm}r^+GmXw1HrPHRS45v;PLYte9w!Ev6SjkZnJa2rHF1{knT5fd2r$|W` z&-?jeOI(m#@S`PqnB%9lMhEY5HN|_ilXylS5|KK}@4{Etb|`hdSWPxJ6^)J#scF~; z!T!~xBc7|yoZ4^eO6NXnAgvb!7V^pqp>3ix3}UiH`=T1mKgouwKhcML{<1BMA5!(dx*p?b3u%<)-ps6-eUw+BG%;!{F5kjo6B{^)k zRmyp#!F}zOW8zzy&=KZF5!4ANp7z0A&{G6_dnE2>?dNE(hM!VEFZnIO@}|vb7Lhg= z=117MyGD^PY7;8(fsh3+&c&}`s1m)|1{HR=8M{_3!l{5zi9yw;yOfEzoX<6dbFx)R zRRAIuNd>2h#&nOmJ_(Zzy5JZ-eVHOFLRGsg66SGR6>^b!%G6{(N|1h|z{>K`7lcPQ zGI6m&o#rU3$Eh`~_vUjXDx=PGv8=OoebyS7ENoSk+?uueYJW#Z){dWLaxTn+3R8k0 zT1TPNugVfWmzCD`Xp`}prOD`N7*CdeHJPe{1vd7juL6DD^AnY4h1Wf**$c13r{mTx zZIfKI8U`vm>E?*{tl61B5~%CVM-pw-{R=c#=w5u8qDWiaC*Rxs3gs7koSAL?(XiMh4tKR@i(s-3`tbKjaUD3uJXrm;mEr_koEz_&lpc5gBU zPx9dkLo6N%WK~K?hpII0+p-Q-R2ExU)P(CwsPlZ6v zf)=Tc5OfH_%8i?bJC*|i!VQpt2Q2DvZ$@!c)Q{PjS3)wMq_Gs7DRhwuPuplNVG{dD z7;8-!5CabQ?ohmnep4*Rji}|T~(Q60MUHR<^_P{{h_z3oCwfBBVRLRBj-z8Z^zmysX&Fs2lyNo zK8VbbE7GLq-PD`$yz_MvHj3|?DZ8uBRWMT%xjH!7`h)2SO$e8$xlF8`qNqo2u*_|b ziVh9+Jp&DfSC@{lUinwaKXo5tyxin%T`sfTb@RS+(1P*$+@4lp1c118I1n@YEQ3oR zH?!1?R;*Z{56Ga_=!Q|5wHLjUO&?&>@5N;zEwHb_Jo|o>_q~a@Irm6P-{W~nNcp)D zcGnyaTI|K!Mm|cVvUI+%aWf3el63uz^me{XcNPSP($#$IFS}r+L32ACd+TymZzR}G z{H?qoWtC{e^@Z^hbwunJsaS;wcM*&>vNtA!QjNo>V;z#UJd6C+wf|Y;N9v(d)>f92 z$H3QBV`R~csLOqq%atV`F_XGSpl~llsRWdOBc9pEggx+Wv%G%~@I~6k^7{*)jxi9p9t5tve3giO9g~dNVTRWEFKkH` z5V2Xe4*OO$gf$Qjd@kyF1=NK@GVj)j*lmG#mE5U3HU1vtg1!T*Up%)k`Wxx}N|_Ua z0kIF~QoXFa0INU1)jg?>s;*c;iPeGa?#3$q7pT{c&b$Wc{c>f}&FkmN%1QPsn;gP( zddV8!n;pRl;zd)B9w!%zBz8Z90~*xyHk0LR#G_cd74N-a%key)?5k74=ykVv_stQ& z80#K0>H$J6Y;@V?pzy^cUr1w6Ni&?&vqUkyec`4V^JS|9Mzy*M!dub1Me<_t(q7*l z?#9!=vx=4q4zG4z&9BB0v68(4`5nYckB~ahoa{r{){nHGmhTL&Q)G4O$zJBtd&6{4l5_xcG0m`$` zVcr_!b#&$ANVb%C{?Q)8rW-?CN(_9Z2foq`diks(CBgZ|^*IMF7qr}`yzMc2x|e+_ zLA0FeK1xL`<63HCN__Nrw4ba#%)!>_(IyOq)M6Wa_J#M~6dWeLq8o>{cLaO~H|4y- zi?cP=0BL2Q1dtjftz0R#qO&5NY<>rGC4vo%=^PK2zq*YXbicjh4H?+hne3){>@J~3z_VwW&)}AVE77CQ>00&= zmWiiBd{5h@8k4>$1aUzQuC1dY_QW2hx-v~D3`oXK-Yh_7S`eA9*`=FgO4pP}Tp3rB zW1SIC@Tg7i`~EcfM@JYPTZG%Q)xi!mr%~4>hw0AknQ*%&TDUsz$C~cPHxE@xWr9o6 zW{8iuJ=LFR;{+&2VNR^xsZu95TaP$c-}DN?`iqhhl7 zjB&xG?$H{*a5;iOth*&n>B;wMow~$50Npe0*382z+`X!pj2+419L1Agh@!NsY~?KX zgJy!NKE!6hgiPHNVR#Q}Id_lC-fbz`J)OQ(PZBHk02ah<&swH_Q&Vzd9aF6nteQmD z+$a&WYI3}nqamyd2_IY`yBIE;xjHmz78!<0*md8?Q3Kwyc_1^oN0c+)Ba9p8cqL@p%VphcEhX`?c%WVdMs>Uc)r=eg8>zfb)>FX} zS&*3YK)hdDaFs{POX*on0+D^xwdexm0x?ZpBHMJeQzIadYFQ^ldwJ3LTb~-?qoNC+ z`!Pk+m*Svoi`8QiUD){xOeFuAQJs>IQ_-K>Ry=$ElUV&3`;%Cmna@-ZEO0viGxi(5 z`n};#D0Bvn{-LvtS5B8_i0JPUXBg=pI!jQT{|zerUF-}h{S_1cJ@$Wy>F?5Ki0QAi r)xSyq4xIjM`V%<)e^)_p)_-aG5BNzJMoM;8LVo%To>t@m&c6N!v>r6< diff --git a/manifest-merger-cli/build.gradle b/manifest-merger-cli/build.gradle index 13a3b3dfe..71dffc817 100644 --- a/manifest-merger-cli/build.gradle +++ b/manifest-merger-cli/build.gradle @@ -4,7 +4,7 @@ evaluationDependsOn(pluginProjectPath) apply plugin: "application" group = "com.uber.okbuck.transform" -version = "1.0.0" +version = "1.0.1" tasks.withType(JavaCompile) { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/manifest-merger-cli/src/main/java/com/uber/okbuck/manifmerger/ManifestMergerCli.java b/manifest-merger-cli/src/main/java/com/uber/okbuck/manifmerger/ManifestMergerCli.java index 2db25060e..353cb94b7 100644 --- a/manifest-merger-cli/src/main/java/com/uber/okbuck/manifmerger/ManifestMergerCli.java +++ b/manifest-merger-cli/src/main/java/com/uber/okbuck/manifmerger/ManifestMergerCli.java @@ -120,7 +120,7 @@ private static int process(String[] args) throws FileNotFoundException { "Invalid property name " + value.substring(0, value.indexOf('=')) + ", allowed properties are : " - + Joiner.on(',').join(ManifestSystemProperty.values())); + + Joiner.on(',').join(ManifestSystemProperty.getValues())); return 1; } } @@ -184,7 +184,7 @@ private static void usage() { System.out.println("\t--libs [path separated list of lib's manifests]"); System.out.println("\t--overlays [path separated list of overlay's manifests]"); System.out.println( - "\t--property [" + Joiner.on(" | ").join(ManifestSystemProperty.values()) + "=value]"); + "\t--property [" + Joiner.on(" | ").join(ManifestSystemProperty.getValues()) + "=value]"); System.out.println("\t--placeholder [name=value]"); System.out.println("\t--out [path of the output file]"); }