From 60fce761ed25c870f4832c06231e73d414e520dd Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Sun, 28 Jul 2024 20:01:01 -0400 Subject: [PATCH] Updated version to 0.5.0. Upgraded to bld 2.0.0. --- .idea/bld.xml | 6 ++++++ .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- README.md | 2 +- lib/bld/bld-wrapper.jar | Bin 27319 -> 29576 bytes lib/bld/bld-wrapper.properties | 2 +- local.properties | 1 + .../java/rife/bld/extension/ArchiveBuild.java | 11 ++++++----- 8 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 .idea/bld.xml create mode 100644 local.properties diff --git a/.idea/bld.xml b/.idea/bld.xml new file mode 100644 index 0000000..6600cee --- /dev/null +++ b/.idea/bld.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 48e8fd5..edc11fc 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index ed6a743..2923ffb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-1.9.1.jar", + "${HOME}/.bld/dist/bld-2.0.0.jar", "lib/compile/*.jar", "lib/runtime/*.jar", "lib/test/*.jar" diff --git a/README.md b/README.md index 14de8e3..dc5fbae 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) -[![bld](https://img.shields.io/badge/1.9.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/2.0.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/https:/repo.rife2.com/releases/com/uwyn/rife2/bld-archive/maven-metadata.xml)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-archive) [![GitHub CI](https://github.com/rife2/bld-archive/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-archive/actions/workflows/bld.yml) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 546d87804f2d6b871ebe34de56c2a58ee30ed999..81e26403225ee54d557a6ac0be90c4f0a05d0a80 100644 GIT binary patch delta 15708 zcmZX5V|d@evv17Cwv)zgtfont{$ks98uJ?)jcwbu8{?NWwr!)g|MTMBbI#p;_F2sA zXJ_`Ad9ypyvH%%&2#KNqf`-9{KtMo%Sk8WnL-B?FPZz@mbRxQ|EIf;RWIJ8#$;BfF z1u>JOe;FkelaPi$q4>^*Obhub*YP_oTl~ae8e(MYf|d4Sy9%>~u0!5M1P6?Q;%d3= z!irW!m2FeT`dhP=c2mU7Yv|MC!z5l^VXCb=x;w&7-$7RbyyEmuq9{gi z3)Ls;>`$($(b!+eB$j-EjiAbe>ipVef_U>F@wR<41<{LAf~gxwpwC{M)-w zK>gx#!FWG~49Pm>(Ne#sdWr=vx{kUkS1Us#hb49az^gTL}EhaL9RUyNG&Gmz784tx-op&DbiAs|zK~S)I zFkguQ7|@zpUrMkUK4QN=9=0TAVB(J%+2e0*A9lR8iHtEfiYAz!FtOq}{)Wzl*eQ&@ zwsonq6Ip40E!A)YLsXN%oDNC~2nl}g%KJ`Eh_q@E?T{DzL73x#J9*f>{4uEruwf#= z+J2L(J5ni@_BFRqt`*ojt&DDI33}-#L2X9{n9HR%t?A89KDiv}HQ_QBgJIIFU)$T? zI$wX@_cL+%4W%HBfs9m1P+yzp;VCshLfonI7K&KRkxn-CAQ-5vNC&AiVEg37{|4hw zE%bZbXZNO<^fYyCKij;DCffP+Xbe$;x3TZcEf%mlwK+W{Bcki#WRx@h(weD zc1}rOW9By`d4!rfVt?E+i3ZWb^;AY9i|PTl0V}M#RJ*`9&!e+B81Cdt*+@QlaBpV2 z6FPbaM4eF@YsApFLP~Bqmr=LpchfikDldYLZ#tjNaDBt#_XQFGBk|X!yKC2`+eO;Q zFIaaWG{vBxsA?0AN? zmG;{Bv_wut>n<~{PliB@O|>?lBe1$2tlgsR%-C|UT4f1wJ>@f!zj};%lqI_@I#0Hl zYiYS;P41TAoRZ72X!pwF_T;7Mr%R+ygc{o4bPbnq5mQ0XTW0-(%VZX{J!Sb!7~lAD zt?G0jPqw=$hSvwLoogpn(qFFdZSDK#qayg+0t!LXm~56yS%jt((yv6oE>DMGHSVeS zQXxdF7fj~ZSDsp$$o3=lNYWBr0}OM07-qtFiI`q~Xw4VtNY~q9;sLLY$~H?)TPJJn z*NByaJvfk8;4AaWco*HWHm?f6dX9I;^JoQE{`Xn8`yxz)(H3tcW+FD^Rmp2m znnQn)_B>wqV4r(=HLDUh`d;Rk(e;e7z-UFZYHdZNol$WLI)~+6{IjUmGT(f(fe{Vg ziKzkU6;{1*gmznbTVn6h%`$N_2Sz7UhgAVXMrIcs<}z-Hs@6mYwZG>39(=V}Yt@Tv zU~&7KEwNcbCYm52-mFHV%v)IPJ)57>YES!WChVFe^MY}vYvl$UB{>){n=K@$jDR%n zIJ%7HDsbO}^ddO{BXqampTw5hSc@yL+<3(U<}UAwlj(ZboGc;@M=mdX-bHdii^xgM zX}OEa^HSq2PT$`b*wTb~-NTpu86B}O94~nLU!i0@jYsNtUvQx?xu2l=U??HHW%9J6 zZ>~%jO?G(hv=e}hx+C3}tlV&Mm&}c$)9o&s(tozv*f=a9I5Ui zaNiSz{gz>~tlE9z5MDX#(AzPI?lIoS3jysrvM+N~a6qFtr=eiYRG~Z^2FlcTWqoXr z-^%r?r_77JcU=rbt9I8N-&P0CXHk>ck~>)I-592qRMc(c7~aVrgtk0EvD&EuH~iNWupkcP(|z7N6UcfTcJ*|EJudRLPbp2 z#R*%e*91@mDhHRelJRLns6wEdWfu|D8UbT4*BC`T}<_#Ez>T^=R=ILT(yNFJxh zTqq3MN3c6){j$2KAGBbf!hE(tPjhDW>FP2BsCO>!A`pKC`kyQ?(tgGMBUR89Hx_|p zm!`V0yLyC{9NK@%aJP7dgqpf>8v#|hTBPZ*t_(1<%gVsh^=j%atrMt!(~hs!BCO%4 zmX~$3SyOc>Pk--3)-;0i@#m9>qlu6}d~FjH~tg1_ezDWYU<0 zFB7+g1Sndh{679*hNfI^<*MG{j=4e#GSA0u*2y#pPZ-jf5tv(@Wbd1BK9%0(yIo=c zO#sHvoC*sAILJ(nNUuF+CeCTGVL*L1LFqLn~5zclVn=>&>u{eNj zS9r9`Tv;Z~X~{z0&Vc9KiFBf8Q#bf*RFMT?^|0DKV_3v`6syK$Uk#6sCcY$AP(L`d zgQ@I2gqadiGkmKc$AjRgsMwFQ zTX3i5nj*%Kk6s5>dU&aV$+4*w&IvGLcj*gCH=&~{6VO31=(0!s$&qW!{b(9)UH7GQ ziipXv;0f1WLO=0Ys|6{2OKs{9-jh)c*3%`S8K0*>+c`}p64s+8Cx`mm* z{ZnsrigQBi0%lA2r9m|DNWe3aI_qBMz{n0NXpJ5n(Zd-6woDwPn^pC3*$fN{Rh~68 z*1M@WCHx-86p+ZK?>tbot<6k$h{WA=Vk&VA zne$w_BWr>U851h5fb(=d4zRpKf89u*T{j4+raYkB@I@=`&%>Q$i$l*L({<+)DVNOB zCf3T4d6Hs^B&g2|Po#Db`RwelmS`V2B)}h4pNEK4xf5nB!8rXjU{*9%gupxk?^rM7 z%J|_pPf8CG)zsAb6>2>zYCxXpns7Jwk0W6X=xqYCron7lR0G~N0g%QTBuajQrDGLB z-VNNSA7mY>5xxDs<=rzCKJPJ9gTb1Z#1}5pY}eB?D6pejs^?(0w1}a5GNoE9YiU{V z3w^hKk9x3emNTAsOAL~sCqm7w6#`b9J)W{SF()lzaur-CAiavGFY~cNc@0G*E zb;V(d|AKNL*O0c81JIL#0vct)ix9Miq>`WT;HwIft1Z5VRE8%GH0_8aKWS(y3P2Bd zU|yHed@u?_t1bqM`*a092&YA3!ZTk7yGH2xlZG{ei0R-@=O?uhXX^# zWy}2rJ^f<9ytw*-P~4~NP9xYiQCr|lrPo?nxE1(sDyFFiTqN;zrZGn^jB6!xH3hJm zRMXrpDfQ;NSwSBrEk!*`UG?yP6~gh!Xog{QR{Hu{J4%kbk@m}&nNKcbO0vFq)m~k6td8P*Zx*0DK#Xur?RDh{0Id^;xoYL!)~yVxqD|qWYAdh?>7WA2>d^J`6kzfpfNZ z#TM=845xk_hDoZ(PHdIoV(v}~qEnS49v9F%zXvrOB5m=g4d<1$vpE~G(K&m%o|XGqw= z-CT@I1^pqA@FV&Iitamu1FjPK*{Npa=h*AYhCQWd^HMY&I6OnUgsN&J&#ze@V*v)G z5FgsP0P+}vQZ4<=x^C?seF*>aB|pA^JO{D0=W9138p;vI4463eY{+!$7}nEkDW9zF z(pcryC?JwXJ8imtmntQ+!*F$}6S-|JKXNZ^)WEtH56{hG&H}DR2NpV;-&&IgzcJ(R zKuFtow4qVUs?@g1PG2Qj%12q&#m7q)T>qsMAYZl{b<$ua(DgT^%PU;*?p?qDn@4VpztCk$RgxmeKrE=QT9Ly?V!2(1t&l8 zEQWr0cEJu*3{>Q%`R!%H&>o$a+#Pejuzs35oPX-2L%$>A(MHo#JWY1Cha>-t0@CY~ z5-8YVN-{bOlFAtztzh3PxnzYe7PDs+oqCK z8a?V!Uk-zI3?3YY z1JQHFvXbAbJ2xMsFda&;i=q3xvB|8);CC-_%=}&y9I_5~#2*078^z~Tda{;1mgjGR zIo#NvXK+81*`VZo9eH73HMQImk63lJ8s{0^#QO!r&k}r)q=*~O&F@dS_q(4aVi34O z@*~B4`ld{VzYD{rA%^6`>gr4bwA%zA(qGeGrS126o64+v<9yPI4Jn_-O;8}z!Mlf4 z@j7EWH^>1IsWjt!%~9ri#K|&2sl=qN_Iqy;Qr#w_WMgF4^i=K((x_9s0eOvJ%VKZ7 zeH|f>k92y^y^7?waBq}CD_d?L5e{(nLC_m0lj8kL>?ud|73VZYU)zXK zD0EBzBl+=~E52`njvHd(E(z7H0=EPP4290#;+ zpr7*+x*qN&-m3k4do4*49`%#oc%<+L;xQy;-TbtLoA>C}I4GC%-@kMdZ}o{^Rlz*B z(V&g7_7?gZNV(~k0HT9jwhDt>ya6{qU|`ED3l=NTG4W0L+n9mG`ougz1D&wtxjjBy z?LKEb+(b+InlY1-rUc`&fi)cs)AF;#F6d#lx42fG%KCY>n5@nH8jR#IMXJ6f|1D3E zN?qNA(?;saBL>n$^D@N7~*+oe(MBQ2$T}UpHW4$ zKl6=Dmi{o?L1F_|^+ia$L4;)mjBdX88$sz-WtQGFMnSfTy0&RnAw@9@a2@92=H!+B zI9lalmece$%tc)Y8_6&I7^vhPo2q3+WA5#aVRLMnf<(B|X-)k~BlPaq#^~#n!P6^* zKj8z@h1Ae?Li@ZrR7vd1u;#;;f}F(tb2(jKwhRPi*~$SqCAti&>LLc!q=v(ctlJPZ zL9wG~f4K)=NpZb1WW5O+?!0Wh)D(xGHM<3CRjSKY-C73a%1kch<)je8I1~7AmnJ`# z9JrqXt{!L5>17~$K5uE`eUixcN7aiL36owMH!{Z6UFe<=6; zP0!3Gje!xzoj=~YX84`Qw7V9=KaihmB?;lH66*hVz&|eoG1#hU{%7$Lf)vHj^lTcU zn%0TTf?3XU(+ed+jw{`IYf`4O^TX^U$pteXKkav*=+EpQl*wN3Ioe3_w=aHq>J{9@ z{NqaIj87ZEQUd6nM48J%3Sb(Wh9gB`P?agSaa9xJJv-Ecl8e?@4If4$s9Mmd+(oY4 zgH5wu6)!7AVql>yd8N1SfekfW`>jjZr!pS2Tt1RtF$7o3N&MYnPY;w;(p#REHEP_j zJ>9N#H)+MLNmBU}MSM9lcFG&qd;)@5Ixi!v1Y}TQT?%rrp6P~@$4o{L`SV_ ziY)424&mGC&d;V1rFSdV&OU^kp{zyVFt+u=q(nee&h2e_eA&LNWFAaD6~Dr{inoxZ zwzx8Dd z3G%_IxR7tnR|HFkr{5QgAP4RRz2QBnn1D!0q9;QQ|$H z?}0-c!^KHX$yDO%sqJk2UEzxi)bVw6@@9YN4m@uj%hbCu-wPZJA$l9nDdvT1Cthc` zouExQWY=@f#}R+ffx37sc*hU(i_`bGC#z0alV2Dg$G3g$X73rk`4{0>kDWIP*(YT6 zu|m@`6lba`xsP?yqyCZb)T{X_qw1cDK_7Wn4g?I1N4msvU$2ty59!?lc__hPBSJX3 zvC!;W{i~GFBO!zCzXnPBLl*LB=UDTkJk}4_beX(|g$ai*e_WkkI_gV7?~6(~Wz%){ zv*;bUFWqfEwVKd@-3}fkylw5zjr%A~(N!A14TSxUV>X8tP$3U2wK`k7tLy%7+dYjP zoS2T2qm8Fq<1J<#a~Ea-qtTn8PfDN7V>)Kp3l|j0IwQ@tTjcskJ;rWjl;x*DS2HGfJmz5Gx0! z9)iV=Ez8us4p7V{VGZO8B>%dbeG^(6m-Jx(kFjt!a4@dnbUXNs%N1ehl7(Hhy(th_ zhb$GKIgVf#w@s@6jZnNV{iiRUy$;?RnZ;K3C#F8J`tt= z#>{&>>fUfM)Gz6&244ogD%Sw-wGykylV<@i$;ygBQRT#`P3EoY{WQ8draX(<37R+#Aq-d1ewtBlN>N%dNTW zF_MPst3o=P_qP49kG#iyaN42A5j~T2$12c8$9k-SV1YhzgXR4pZ3<_BYQC*{EICDV zMvYpnsbES7zK@P8{Igx@IICD^t9C=ldk4?sb&>FJx&@#6pL zlP-R;Mb6F$$ji7_T3%dOly}%sMH8LyW6>?2cYKBBVe=gcduA-P$M+ftA6Fkxjx}DB zYAe%l|8ql-J}OdGPyEHArEP&be{^y}t>iS3VV3#+D{TAzr@IzID|i)@IuIwkS?$~d zV>#$iIsM6A=LyQ#eO+-NAb{QTUiXDq!+}ia?!k@@NcmLXF5Ho+tl+Z{s{0IsX{n?0 z$NOb0|86>@-q~5sYiC3t&3k2aYNU&}tf7*6m6r5@I?=6Y#1Zb0wc6ZCUU(<;+i6Majd5@iXi=C2sj`Iezgo$4*wbUz*V2n9w0yz)_cR z64rhL80u!*ItYd*3pccny*Xp@UsMP+o}t%X?+NE6=JJ^x6dtg;tfk4Rd7wp8pe5U` zM9{V+!)|)ym7?4Y6+U(}NjC?%V3D|lkyB1?QJ{UD0p@!Hi#>*zoRraGo7P8zR%Uq? zqU?L6f11u4RP}FnZA@YT_tW<*F<#hfTIR=5Zer@tN{de@}FoLDs`lU0_}aXZ?%*;?J7RdF@nzo`yUXgL^XGeGTCL|>Dn5UPbeCebT`}}=+#c|j? z$JG2S+Y9L@Il8*qsY|4207&U_oGM>dSqLUJ+gAnd(jq!PoW$<2D*A{7X#{0#UW_g} zQ0>!2BZ@=^W1XO(D2_mrv>S(;1LNi#(9D>XW=<@rwVpsGfE@xonq;_14}HJ5v-wrb zxWh-tTEGXa919drV>++J0cKe%kjb2gO#7`4FOEyk9wh5iIr_hUOajW}9}}zvWoI4dhou z1O3W!4=tA<-hnfHE7k`-sC!#CxY=V1&S6Xo`-9aN1q*R~dqO=DD{?8o(z2aw+bje+ ze|T|y9W(5uqP7sNAu2WsNE_~9-W3@hQ6LQTT(sWqZS1ao3aIy5D@ytMSAS!cXGNLR z_iXz+)TrD?e5{LR^6T_3{1?2q;X`_nL8~n)(%4(&I1K1dt(L?Qua#2yvBwznA6o6z z3c;@C>0d=d!{l5w=gB+dXH10;#~79FIa+?^ zDT7GV&+Ll7?uk-uW7Z0!=M1lkq`M3`p*Kq=nm)+;j@381pAS36fLJiE@L}&GZ+BkR zrunS;eaC?BEhJXYvlNnh>>+iJZ_i;TPub*4mue5q-&x}K>>mmDUT`FlZY+OC3EqX} z{;hW5>t=(JW&(G)yXbNSMT(f7r`wJ`xKT5QoYRZnxo@6Sc84!CWSb8q zfoJZsRX$>46jEv0k5X9MDiw+Gx-}eUxT?Wh87o|f*(pkkaQZY%l2rFn^}oMBc+%k z)}2X2wz0A^9Zaq@8#^9JNNV6`9_ln&|6pxQ69%|YjCC<%MNUKw*^-W9>h{p&xvrx} z-MdZzjj0c9R}p@N%Yx^P;} zt9xxC(($wz)X$O^fo*6bM~bvVSdL1AnDfh=wG47uMRq597vnzVD$tNu=04 zOO|Cc<09AcOu|!pfbBNq?L|ksmLcZ4n<9O)USILw9gB3Iv>l^9SS87RPWryI+KTwB zm|b3*FYO9B*E*y5ENkc_Ga7x};uh<<2^wLsYtnb)Zz{f>iV8ogPsR5K+5{|#?dbrG zq-<|0GVzfEBF}+xOJrS2$pKWK=xU&Mb)y!R3u=1N|9#q$t4oaYSoY34GI@rzPO~Q< zA0Q&Sx4r?}mxlTxOWdGtbt0=?(>l*z-ofDnk}k|!O?-)2yKZd&m;7bqr$UALyaSbeOxHuv}21M}b@j#Eiz(;i) zvGL=N++@SdLPe}MaTzbH{Y3~7tPBse>jaf-y5YlcVayZkUvaba>>BJ}5r7{XQT@|Fe%^UeT z<}xn#NAJheIvF-kW$cV@axMj(b?dr50ofXOSpL4VlQAK>ZrK&p=|Icx8Ex#KK(RZ- z%KMV5P~p%;pI=DF$WO-lbM(Jfha8rPf(p&@e$#bg2Z?wU{LVk8%y31BBo%v>W{=-M zZ@a^bqx(7dnO!XkH(>~0G2n)YT`!Y71_Lzstxi(rhs7O{Wq>0G_ScZ#eTzEY9(~W& zQ9lYIRKs`~r>LKdhA04wh*a|lV_CZiw@%ECzfhGyeC_`AsB`oNtMvMF&R|}Nu(X`` zLvqbx3qhFJ*@`qRYs^`T2%L6g#chh(l5IPx)}yja-*SzeRzaMJDt9mUOEM6fC!Bgj z8VfLLynFdnxd2hm#{8??U(}2Q_j`2R?>Ii5UpM}u<#5n_wOW8D%jA|OH2h*Q0n;<< z4DV46VnAI4LBV=An$wsQgArxDyiHIM)-rUVK2y=`j&sT_4=u&JabrE^i*=nhbMQg@ z-;k&R47;x+UTW`^?V!hSS;6Up;d(qv>J0ID9nnT99d}WSE-wt^UlHNs8rOP=){NDr z;XTzH1wpWnFYmw(ZFBcd@(<3!@pnH>hyS^XADUXITx|)(Hcs!)Xawk`=3Y1ChQl%3?8= zey=PXGTY&nb>woBk#u4v9A@m=NHX*4+6^X#?EIb_y=%ZhU~ zXKD0fQ0@UBl3f`?3%zZg;Dr_tj;~c)Z`=_I*raxwkk= zzTJY%jOp>+ZH^&j`$m@zXRiXxz~PAMhJwm^L46n)V_1smOfMF+8xoY6zv=|f43H^> zLlpfsNaQ+KJN&*g)LbvL6AJIlq)Uh;QZIfic+K$$ zsD3R6+M|C)x`pRZHM$y9!ff%tdR*i?dhDEIQZ3JF+c;dIjJ+4P^3wX^VF81u(Nnl`ougkd zm1SrI&=?f+%Er2J2i@$2r4m2SKzyI>P`IU4xaIGz+!I0A5nVx?*9e}PN+=-Ao!U#a zH8~i4gOlWbH2gd!YE0mbq!9xA`|?=*tsL=${Z1>G?0`)xcKgfS|I;<4<_^smhDbi* z&IlVatGJB5Y#5!H^cKfz-%#$)U1Hltx*3gu5z2~SM;K&d)QJHx!caP@b)=j=$roYr zNu=TcjO_VVeK~)-6!4bc{^&9Ji0jxC&lcX8vHAf~5xZuTx=b<+dvg*nI=%I`2h|2Z zExLhozRc)-VvasX{PG0TjDy*B9(F38M9x~MiZthy9lJ#ZGMWe`<0=vB|ZG?LKmFOeD{LLBPu!XSzNdxHR zOpEuZbX`*OnRc}Z&Xw3t(D+YVXnrOtNTqT&;?uB;fY7Ij{7+DMz@tSV)$w^FSIiIg z(ltbrhfyaCo+W&b+r1FqW#~g;&P^~Y6?>a>$Ma9?o=${|Vb?JT{D&h>sSLJc2o_dt z#6ph<8A(!_YzF~gALr03K4EZg(WT~`tD0A2pjzL2k&~;zz2~a&JWl;0Ssh1&zQ(9^ zGisE`_@{RFA^W)*T1niD5GQ$$sk_@OtTX$DexCN0?K!$czG5Z?D~@{PszHn!@7z5p zHfeZIpX?iaG&Uf0btNqG@OSppH3m*(Y?;hkvDh=g9-de#By| zW5k}SF?nu#8ZV*;V7eRpyxyzgOll@RP3%#6qvTA6@;xrc_DmMSeVNKFjakabp|tvM znam)G6ecWS{RRdji7sM%PkP6SPkoK{FkHZ-s1>9Z8M^niPM>8i9wSiYKq>p738u7= zn1ZpyMwjmR%e>3>ILrd=ar-BJi1%*P7$kF?MWR#oe(}cvQ^Z^r@rnHKo3Fb%?jaH? zHa1&lFl#{1tn7%D>}wQNsMFB?l#S|6g=B2fB5In)vPbjp+dbwxvP-08tbwn<;&h9}5`q>@F_d^&vAvUwjWjFzU(w04@fHRXd zazDrTq)rP3;vqXrWwVrf#<$AkAo*^*_z}+7%5bG8qNatN#JREQ^9o zsglNN`4w3Ttd?a!rpVj{c3pxQ0reyb+Vo5*V70b@>O{t4D-T*-s?{U2wupV@n@V#D@tbpCAik9{84`;lzb5Qm0Gp$cLLiS{zExlpGk4CC?_ITQUO1g91}Zs6IUjeMkI9xY!=W%tec z!MmY!Ze}2DIFYT7x7MP`iX1+Ijy-_UJ?$-GH0MiiVkczagQ86Lvc?!&)R&=ds@&dR zT`0W7qY#*{@_s{U{1Cf3MB)QpVm)st;)CYg!0=v&gU$_#XmG*}>BQcXXAG&K>PH`B zq3%}A$i3zR_^#4hzeitsFrGh@RltIYIL48U3A_iV#oS?;b(Xhk%BqnY>I#hB9$B_w z6b#&DM$IsCAjvLE*^kMFKRN!3u4MUD<6mE4S>>4Lh+(E9#TXSC4XQov$OU&B=^%}X zNa5mdR~$W-V@cmU^z1)X-jW=Oi*vGoL_5|DqcQdfKshsV%H8_0_#9YM1FvjoKfI{5 ziDONOkCba8hc`pd8U2@EjsS}H7qpIc$(t~ByCNnJ$mm48HsT~l#0_F|@5${+NB)O| z>LvTkn0K4Rt(@3-o&BLh)ZJ6(5-bQk$o0ER-k+32RW>*RPcUAwZ;cqJbeTbatC^Tj zQ*!dIXz;d3Bd71Bvh(L7c2eWnlj`a#6LVfwaf#JUkJ&U(%vn|UtpL^HVZp>1#1|Po z-=xkPjNGF<@M}m-37^w+Sd4ry>5^aQ z@U3{m9w2aqApg?xnFFbsZ|gP1SB%BQHG^KX%DE;r49PH*4uPkuWjxuq@=ayl1x5Nv zj}^;F*}mMN_g&~lHRYO~J-=M@H6ySjYc+>X zl}?PAt7y5?LC|gnJtooIba^cxB``GHHawQA1{j@Wo;Sixr2;1o@iMY<+t6Z3YTf(P zJZ3j|<~%Cu`)v5(Z-!nAo?`C|wel|3M9sG|M8m|4o8JCHV_gvdw~^4`kWoo%0unFy z6)IX26iix-;l=}g}2D?{&kUz=Kl!|{J2MTm+qY?93R`q?4@HeN;k+x zfc5N77U&kfMxXrKx7E~Zh@nkBlPU)j^0|>$o)lesA86Q7dhTqM^p#(u>|yPu0?04o zSgrIn{T0rrmKsl^iOAV~8o{lzPqNPtA2G+bf=) zi%WKE2Z$r-vm-=0WVkm~B4u}lm9y-WvdYv1LS;A=pIFH=wx%yN^+K=P+CGZipdqx=uXCGlx3j>WP7ZR z2XNJ*8;hkNFf5m_P_0ySQ(U(uvvz03O(-l4pUZxJZ}}|Wea>OmKumkD6n9-~HYYfU z6I+PS(_yAc8U6ej@gq=JZskol*Sx;t;B(>&W@+T8kEK8+kCV9cpeCcZe>ZPg52H`&$^2WgpAHauL%<47Vj>czP?I z?$OR8pozsrDg0l?gA?9^r9j&I$;F6k+2!!*oogL_8T@0J)Y=`i zQ{qCUuoI?dn#s7F4y8D{wkf;D9Kd9^iO8KmeEZ&=u#;58voo>K@W<@;Brz}sY$5~e zq*5A}lqoTaUi{xrRRgC9#CrOQgjjgo$=9Pyo%M9&ULA&ss+AMMMMc$Lgu~qjg~@g! zIaz4iIr{dDFRfVLHjcr z-0`&KIt=O_&Kw)6Rwk5SUJR=cw6WA7HENwEobb$DB$9aPf1xF0K`R7v65dg+^}-Ho zWwEn6hd~b%+xw%pjoaZG!W+L7R;#}=B>W8uPr%iQ;&*)s!Mjv?rQM5aJ%X7kLgm#_ ze_krQu2$J~Xq!KpZ$;xV8U`>$C--`2PkX)lud^y5^r>UrqY|3E<~i?&P>QAC-+I4)87%4GB{krp^Kxwfake2lWm zH>tB@WLXxUg&b9S&Wps?)Uy8d!LS<*Q~CZEy0S&tKqwO_vU6BDywHj4fpCO-xygZ48~9qLpps z!3y|7Zs$j8$WeSAX-`m}Y(hCy&{4jN2E>{8jXH-s9ouz?N*{k;+))SOMJc}(Y&VFE zJ*|Oou(?<3v)2x@ow8GeUmxDV>JakROQHdW)DAonWe40pE}^z zGf;pyxIjCKa8x+kQ6~b)aogW!MJ%Qi%r2wmai`oSdl9h6S)U~H+BJN;bPVymR+F>B z?Myy7YaNLt6QAmV@jmgb(qCTr=-ssTsA|=mhk1TqBd#VmYMKf44XJkOuO~ZKy79S? zF!D(-TQ_p1aAS1taK}>0e<%fki@loHDxGS^ zpw&HxLfWU@f;&4*#(!zzY`ZpG$HNaIN{}NXx9A2q53S#L;KNcc*p&RpU{inG5t{_w z*r(c>Pclk^%!&wLU9Q)Xk~G;ZzqTs|aL*#?b7|-KTZVi9n(=l+j}o~XO~geW*~W(P zdI~Wgq$~Y?Yi@pQ%AapWEDv1M+sdai9fwaft~-p`mZ;h#K3UQu=I2nan&~pEq4N zwlNdqc#DwEzc#nf$J=*Kl?vZu)2?z~!1afHZ&WV!G_7!oTDVs{SlPWWr0Kz;|Anm~F^ZPP^G^qxe>(h60CK^900}ylB>xdR!P}Aus#-Wf;R`X- z|AwHB{GH(l2>}uK59XgX|E;vzBy3xX{gvM`&5|u~QeJk9u6~579ub~~Mhyc7QGO1m zG_sziG%s(5i7v08)IU-f*mT~^Oy?dcs>=O)Xt>|y-r{^I@XGV3*!_C_Q4(%h_pBX- zHTT=n(z(_e1Sq*Lw9N<`8nWmtTy(yhs>VpPacS?F5cnz@N#&JOqi?7#bRK6JX=c&7 ztI!ZdG8?nW9#l3APnn)7=1VV(Dl1J(aV6FW;Y4e=g+bVV{aJ6>s9;h`2Bmjet;N4Q zmefOuXNdXJ=;VnBtWAlM!*p#)(^+gjIZY?DKcl6+1AGHJu7p;OQGgM+6pF~@XBJ3* z!uDTd=UYx;DU?cw(T70ybh+74T9rXH!F`$ z1Fy-JD17cX)xyTS1KFO--8Jek@D5r@mN>~MHG;+ms!({rIDr>P3SuV zm=cGv=@_eAflahs4%r7gTt*7KE6c@!Y~Jw|z-$eV9O(PB(5Ra~?WiAsdW@==rZWr>rphbNQ9!fVLk>NcMoZ4D&2*cVLW zb5Qz6jbMWb(oGW;^yg6`Vx_XG(ZLDEU)>twY<~LKHPMP6`XBWEU?7=mH|@&xDqSk5 zRlqob!mBFSiI-NA-!*2m49@Y}s^H@R7Vi2=33%(SZ05mu0WpOsoRvp<`hRBIz|B=v z)x`)|yZHb|D`hLl4F^rKU+W5$cc~zo>%8EWZI7dnRC$9i+}#c((BZbLRj->9-44b6 z5-qeN5P$6y`G*Va0+ukXq0wAO0WtL*Y%@%%)Gz%24{w@oY{RW32cpQM?=QiCMC$UL z%(@+(76G@fKtQ#Tol>mrD_bU0s-04tT?QoEg#h}FzM_Q+XKoUo=El*|H7j?%5FXURk zi;?CcjkWjSE7{YEFB^{izKpVp{^4YtusP9L<>g&kXlh*K<}OC4B>DsZ17NtK$2wGm zu+z&zxb&R+3-j6+!%m)QOr)0vH%GgX9goJ%I$0^J%gqBMb$sb z7nK#o)%n%UP1OszDEX+-X*tj-M06XFMHTMQg={lB>4zPLxG%nUuF}CJpS%u@GfDCV zl%XAXt+@xt1>UdoYVqa)D^)AXXVrEg^SRw5|BOf}qGXdnMGzv{9(5cPKCB2@Rm2B6^NZydgD@2UK>|1Umsjf*9+? zGadcKn?{9A@MW*&3F-s%Zr{sjS-pA`5RFt3PoZKDTT+%l0q%GndA|s(qX0K9} zoy>=M1}}qy0C-SJC=??@*RwO%pg33S4wUI9StAmL%#Gaj`tn7EIvM$1J@nq7Q@y^# zaQRMdC9bEgnWP?=R{pa}_wiU`_k!|{!-egkvw;~t@LT0Na5|Z6{`Af}>ceP`bl_7g z!8~eH&~-gu)CN%?hX=vLyQ3{6FD0J;$~(xZp&G(N*Y^&$_t9F)|7uS6PE)1H&d)1o zBfh4GeL_LklsPyf^sIB+OYCpsvA!3YEYI|M749a^O!YMImJr&{)L{;<`aA0l$<3nm zN%GO!Uk5>w@db^eVCZ5#tlvH?N#J@0FrF13YOnlS@jeWWJx1Rlsnk&3XL<vT_b0!ukC=p} zer*URsb-F~5;c6+!?ew`H_JGqeD%!lF2BzgT>siRoO~3Q<(M9m61bj|{;t(xa>8)=@Gi_d3@=k%uS=aNq61$>n*H7qp|b{ca!p+*VbT)(CDnNZ(}$n z?<>wp!;#$+j1PFiB7%@r2g`+w2qCQflRyCigJdlytpK=KhzRW-cJ6}KeYWaTzFa4a zG_CXW!9+p#yMNQ9qk557#l)BF^*Gb9xNjgY+lDqN9F?QcCi+?myDU9;<4lU^Z=;() zVURv+Yo5sB)jZ*c4$*`%7s(QD>@L@%jqdJs?r*58>$bdg@Q1QeOY9d+SPteaa>305 zB-5V`c`o+h%%ZvstNXi3{!*r&NrBITp!tPwtfYpaB;hW;J}~6-qq3v`q6f*Dz{`_0 zI$*=Ufm=~so{-X(+!a9F=V11=y;v3iCMpu%CX{@9h?6pgB(Uc7e%x9-!P-J$GM*kQ zdZ~4wR$QqfP;}GcD|e_fim+1qb;o~1@;qx~3XQcG13O({XXK+Z7Z+QSP2<}`Qw%Pg zc%6Xgp0R_D=i7wl$l%>PowLTRY7wjIBHcQJhi{`pk8F-@@Pnzg-LaQ&jNbuYfrPfS zY&#+C9dG|8?h5KetZ!aW{l zMkANs=kNo58Xd!A8tz?+O_GJoc*v7K8Yd*2!rY+Q`N@z)IkzxP&!Oc%VXSTTOQ;F@ zNn}A0dqVaI)mb6`b%{Go$IvCE^&YLco?`q6ndnIhiIs8Jf)%2{LmvZHsp;k!U!Iow ztEN$qe39KbYYLjm+!RjB54c3ePPzUX-eS4yS9j` z#~WDjxz2O$poODdtZvaEkGYxi^W$}H`Xcq0p_p7<{D=W`+EA!#eP0n2195~it$lTJ zbyjzuGa9h(pMxI6S*dm)zf(%R$K-aCl9?R=%a!v!Qlze8;II6F9e=PE)r%_DkdS3% z>}D9U=62>^yIbH1N+$f1TC48&LWYk_zE(*|9~uh5@8#dh&)O`$rs?$MGomjEb{St^ z_{thfrQc&$C%CODIE)OY6AE0rc8oS1C%(<`f8TFV&)Mr9sx18h*x8gBHaDaAiQ61T zzNGLIl-<~w(YJynSrA8vQ&r<^YP*XzLBeeg3=5W=gQ_sibXYc8X~h&@dz54aM3Ffs zHFhN;e#&6>Qzk1Zn9}Lv`~SLNijj&e6fvS`rO-N)gdez&jO>5!%0%CJn*VAfd21%| zgN5V>^*2<4PO^3kP`7}!9r{)zT>0~%SLU-&yn3Ai1}7si8glYf(PfrEOQHF)HQ3aK zigU4P!L7P5qywRc7REx?EFd$ej)(pA%^GD#w9OJvya|K;yhjGq1Kfwf>q`Z3U^~ zQFXcGZ?XW!KJ0u(k?Z=KCPJn*`3Twr)TyEsNTUG(>-Z|13d&V=c$W@E^S-UK%TTlW zYLKmZ#n!KbhsOYOktJ;dY6W^*b?Oak`<74!UBLy73aoNT*na)^i>>ml$w{iwshinHwr7U1~X#Qx*{&+ zNgC+%_lYrmTrSuA%`1h(Vx9J0u4LDuHm|{ot@JWm?Ht>Srt;$S2t`Fk#J|MI%7{

a}VHHyUr& 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 diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 8022d33..11bf37d 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -3,4 +3,4 @@ bld.downloadExtensionSources=true bld.extensions= bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES bld.downloadLocation= -bld.version=1.9.1 +bld.version=2.0.0 diff --git a/local.properties b/local.properties new file mode 100644 index 0000000..f9361d4 --- /dev/null +++ b/local.properties @@ -0,0 +1 @@ +bld.repo.github=https://maven.pkg.github.com/rife2/bld-archive \ No newline at end of file diff --git a/src/bld/java/rife/bld/extension/ArchiveBuild.java b/src/bld/java/rife/bld/extension/ArchiveBuild.java index 7333e0e..551812f 100644 --- a/src/bld/java/rife/bld/extension/ArchiveBuild.java +++ b/src/bld/java/rife/bld/extension/ArchiveBuild.java @@ -19,7 +19,7 @@ public class ArchiveBuild extends Project { public ArchiveBuild() { pkg = "rife.bld.extension"; name = "Archive"; - version = version(0,4,8); + version = version(0,5,0); archiveBaseName = "bld-archive"; javaRelease = 17; @@ -28,11 +28,11 @@ public class ArchiveBuild extends Project { repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); scope(compile) - .include(dependency("com.uwyn.rife2", "bld", version(1,9,1))) - .include(dependency("org.apache.commons", "commons-compress", version(1,26,1))); + .include(dependency("com.uwyn.rife2", "bld", version(2,0,0))) + .include(dependency("org.apache.commons", "commons-compress", version(1,26,2))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,2))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,2))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,3))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,3))); javadocOperation() .javadocOptions() @@ -41,6 +41,7 @@ public class ArchiveBuild extends Project { publishOperation() .repository(version.isSnapshot() ? repository("rife2-snapshots") : repository("rife2-releases")) + .repository(repository("github")) .info() .groupId("com.uwyn.rife2") .artifactId("bld-archive")