From f460748a123cb8d80688738142b5c7f2b934d793 Mon Sep 17 00:00:00 2001 From: Cervator Date: Fri, 3 Jul 2020 19:06:06 -0500 Subject: [PATCH] feat: Tweak classpath handling slightly to not drop one level in the class loader hierarchy. Should allow using classpath entries added via the launch script. Also updates the bundled jar to the latest code. --- gradle/wrapper/groovy-wrapper.jar | Bin 5279 -> 5243 bytes .../wrapper/GroovyBootstrapMainStarter.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/groovy-wrapper.jar b/gradle/wrapper/groovy-wrapper.jar index 3c9dd817685b6c77466a42f91e49ab249951ae63..e2944390d1355cc6033ea8711b26448f19093e27 100644 GIT binary patch delta 4577 zcmZ9QS2P?9w}y#e^aMjhiEhk@GI~uAC3=tEMf6^S2}T>8!RVqzXLQk`_Z~gkXwh3D zlMv4TeHZ7f|LmJ*t^Ho?%l)n=pZf+xrlpGakQfIC0Kkz#Z6}j?;r)YfmVfaH^e<-l z$^Ns{S`SQ1L=)oRyiKLRm4?Bn?HNNNrQZswWz{i^uns+V-9VqhWAM%{98ml+jK0DM zz-#DHFS$&r_I6=;8E3(`cA;|pXMyoi{Je4O5JAkNDLtpoI|i6m(E74^efF`Oi%fpU z(67Mmvn%QK|QAx>UEVN-Y%%LNXE?LwfEQebQHd$e60&0+Vp&SOj z0DN=+43H347}rO<(37UE!ym31=3_Jn#An2Qh#R7Qb>72IaT9GAtT#9$hiwhxx$?=KTTj4L^lu2X3%u<_8AeDt z=1!q|49Qn+ zPq5l0gi!ZsFbJvzYx&PZ)lXP-A(wSN!o*B5d(=J8=GV9-VO&;T@gIsbvjP{?_56{f z_AX=deC>H}M;AOlv$5#R)Om|~1oG(j6^2=OT}t@`u`R9CFOP;o_S0(-=rVu9k7w5EN{C@qT& zX3eJtr|`j87-P&D$=duaR>h4&g2s$9!EvwnMD0l2GlRU;@ZIdp<=p38gsH;^{W`;} zVLES>>JRBPu6U_GiU>*-rfh9dvy?09E`h9{eDwL|o0NLHL_Mn;I*1zj+#Fa9RaSV# zjm!Y5OY2f^2;nS1w?RDb4w@%?Sh-3IL3M*f2emSP7}xqhi9laL6$gtpziL1qX7>TD zN)?odQJqqKP#-vjp$B)x?DuX*?eyHDr-=%gt7A0?SVy|l-Ci#S!k%om*^nWR1Zc}9^4 zUs}Qu1dZx)IY>90cXcxDou(h!{^cN_-YsP}Hzps+Uu?>m+D@(OX}9RpB-`80Dx5FKBx%}ggL|a2M?J(C-?lhlhH|2t4>i1IO|fbvDO|tf*<2k9arOZZfW@hdy+rTyrb6|HIyU~KFCPHJ!QRv8nfM<2irAr zgeP0JuE9u-pk3}_W`lo<8In0DMQnrG+cx|;F&1AAlr3=?Q(b(dE13>06)m3n^@r_L3BCU!rZ7){BZ+1KFiK zVPDywQLJuBZhoe@&AdKI73~D{LQBB=%o%9hAIkT?&~T#I1_g;3#A^?%co@@j?rOtN z&%v^EY|vh)#xTr3Dh?^8hpD?3i?X`g=m~5Tdeoazd{3TuwTPI$9dYE8mSgIcfh@DT z6sD^s2u3NF*1~AAQ}3c-ztl0|&}M#y&^L8Hx@VT|HMpk0_m6&{1{`C}QZJ0mw z;g6H^zl0P4TDfb3Tc+)-S!PWb2FE{QLpOWVshJ8@Eph&aq;|)=MQ7lZo8G^6q^1$a z-2~ld3dDvtjurKbUgE|Am^MPUpXQ%g11hhIt1nE6EY+u2?u3}3g^j`;gGL{hDzTDx zqZ{XmZ<=kpW@9FZ=It{_E*$jpRt+C=lV`7y@x{z{#65saix&VL?=jbobBFgD-#A z#g9|sDzSX9qhcEcSyFvjA{Tj#^51+4*h!)=VLli?fPaLT9Tc;9N1kSS%SRm-K3HR0 zdw7jiwKNR#>PX#?7o7MI{K0?@ zqd}7ne=XTZ6x{xhbl^oP$i)4}2LTtKnC1>HQ3W8K&%PhK9g+L_?zkV;^Z1c@`(5vssgjg&WP_U(skEK4;q{i=Aw+q; zHmF(0-Whn8DDXu^_TQBm6faVU)!4cFt>S=`>JP)BnPRxURUZRUJZi;VjUqmKWeMdP z>6;npaX4NexLTw@B{WL4Uki`u2`}MXofY;CyNrt88gdC7a4RLSRDe@YXP|)}Eb)tcm`jHT?3YTXF^}2KQbv6tdRoYA>A;dqYnhi# z111Tv9vqI=y5?*F!A}%UD@SxBG>?*zc1f@Z`g=>34EOi@2hpb}w(VHb1Q99IV*(;k zLJ~Y3F)Fk^!|R0Ep9;tE16w&6`XCEMmpb^we~uEbdD10MS5Lom6J2B%|#D4en)7`rC z*A5HsOrYgMnPR1zH)&5oo`3xPnQ3hVfoxQ!l(E|rSG*_aPAk~6r<(A+uFd3id~oXr z4XMRYV2cnhVjf}zYs#@CH83=Q!P*xEVb=pX|AyRgUjO|YXhk#E!9RwLLclN<(7S5P z<6EV{BJiDRqH+p&B6;+C8(jibu1v0ZXE_`gf7GT>!4lx#s#k9M{YYFv7nDoe7DTnBBbbq6*XWShbgW&i}gEgF^kWG|BKi=c!vLa(07==)knn)G*@L^uj z(9h@+74vc(Wj(!e;zirn`Xy~T!gKl+$tA}6SzOUF$x=L!yQ93Qn)}B{~nc#a!SbW2QI8c$sJJrcP2e;6^B4tABL16u+evxtg1jFlrpKu?x zdC%5DMyA+=Vzsxsu+bFCH;!?jpS!+&xz)loi~?@iX5xkwO5TuedY-&Pf)Z(+$!2#V zNqcSNm6oBoF@5YFn+ZQ9XgOC`K%IWg-kzpftf0Z;jj5jR4=S}y83jM zQ@0n4;MccC`3QttWA^lizII%sl?kDbkqc@}N?dzsZQ`k};7$_09;nf^BZjyn>yM!t z)gr#&>$`~_BZWn>1}k5agS0FM$M&+Bgae@!>v_A*@BBF=cbD9|sifs}O_Oj$0H`_S zE%}f%MjT@bi^ZmJ%jTMMtYeO<(U*_8bK1H0PLnk*$XjS=uJ}n%c1sGK(YoKjwEL2k zu&+Xc0~0gX2>=TVTfG*y-9IBpnxb%;oh!+c@}>(MI{zQrPw`p?25tz=u3HscL&wZ- zc$Q;q!%_D*mf!v0wY*1=B17gna<^$% zlXW57gTjf~A#^V%ulx(8d8;ot*HJSsNme8?S5?Z&E942QL+uIjE!s^Ll@Hm#I2o$NP6ux$T( z`!X%+%X2!OXP57}+>ag_*w&@Iteky^5_vBQ3u1UPJqB_34i4mtR(My;mQ{yaITP_V z(3Om_j^>voqj%MigL8l968xqP-+l(+wS<5yS+%>4dr(BWe@QTl)XbLmw&$2_&9-2b zq5VB94u_5g0FWd`IG4c3GZpf+-7YO zM$l6~KwUTasvt`qMx)Jn?59JG%blX z*jNy9eUUg2_I-7)E$&3#PCYnvNg%Yj(#XtLqu_7Y^NL8ihD;4g#8=&ipsGlv0VNei zedAGis-5JvTybV<(xjHidm5dbc>&)~{2Ik2aRu^{6ZdVPqco4b$9kjwK_7f=&KXfn zHpAq65yHQbLJ~|UVh~rZ!#5V{?0(*@-1-i{y1Hx>8crm9QW7ZH#1Lwil&(ekEYnCJ zyTQ6b@H=auu!4F)`_e&Qfcw0W7?EauTi)#pEmhnH)Oi1ETT(w$`u-zWQU$5_{-qt2 v$iK{^lKFqe<$y|$`5y=KUsVm~|E4(f4 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 mainClass = contextClassLoader.loadClass("groovy.ui.GroovyMain"); Method mainMethod = mainClass.getMethod("main", String[].class);