From 48fdae4f79cf8aaf02226ebee18ae5beb54c9a1e Mon Sep 17 00:00:00 2001 From: Kevin Turner <83819+keturn@users.noreply.github.com> Date: Sun, 17 May 2020 15:51:24 -0700 Subject: [PATCH] update gradle & groovy wrappers makes groovy work with post-2018 gradle. https://github.com/MovingBlocks/groovy-wrapper/pull/4 --- gradle/wrapper/gradle-wrapper.jar | Bin 58702 -> 58910 bytes gradle/wrapper/gradle-wrapper.properties | 21 +-------- gradle/wrapper/groovy-wrapper.jar | Bin 5142 -> 5888 bytes gradlew.bat | 4 ++ groovyw | 57 ++++++++++++++--------- groovyw.bat | 20 ++++++++ 6 files changed, 61 insertions(+), 41 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index cc4fdc293d0e50b0ad9b65c16e7ddd1db2f6025b..62d4c053550b91381bbd28b1afc82d634bf73a8a 100644 GIT binary patch delta 18673 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 Bgx delta 18406 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 RC3`**IJaad=rFcB?7uiSG#~%~ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0455413c7..21e622da6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,22 +1,5 @@ -# -# Copyright 2020 MovingBlocks -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#Fri May 15 23:25:48 PDT 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradle/wrapper/groovy-wrapper.jar b/gradle/wrapper/groovy-wrapper.jar index dc694676103d5d1e836fb9a36d4804c3a1279cf9..c39c7d1bdd7b1d47477c17e9cea86fb8a07e0d66 100644 GIT binary patch delta 5393 zcmZXYcRU+@x5t&*YQ)}cZ82ld)+ky{Y(i19u?ZThZH(ALtx%(t#@@S8o1$vhDoPPW zQL{8^^tR7)?|ts?brIiJ7Jd1FMwrRa?f$*$6nkWf*PC_bq(PNf&RD&h2} zD&4*6>-eXluK&B1iZK1{ll%$Nzv)jfr^_<4agmYy(;?v5g#8R92?>TVo$-n)(&{vf zTc7iplB(rWrKc5wz6JbR5F)A4oEcLX>#glE`HtS-rjkb)+vw>o>07^~P?5<@CTZ*= z8l-GWrG(Osh|!^!jc?h~7W;Y7xle`)LbyJtFDjfGBfOZ~d-?NhJ$GX0cRPZtOY_{Y zyZ!x#_jd~PWv~tmhfMeN9CZEkkp0%=!o}|##N5KG9JqYhqnNd{j6YK)fF8NfiN>ww zB^}W`I-u_kElCOz`;;W&s$NuZZ7=yF;jC|q45Z1?9n12BgWsf`o9Cn`q3R9%jyQj@tvtZbG=osmmI_ubGAD54{N8%EN(;wjo=! z&I@u4WX<2%Y}54Qdq3cF2wRX>C}S-Np+*r%$(Wm*&4;PVC*lOvn9RK+v6y^Sm+a72 zapjH)^HIf?1r2II7Igq}L@e^w>(+DxMEgN>IL;_LbOwB?eowEV`Rmq(ospckr^;d~ zK*K#R%(9dYPNWOAViHkL^*ypMQCO~M!_{FjqSKU;W|wqenPi%5 z%*}Lof{-M3ZmPIHz$Prj?0cBt4pMSKwJ*O`H4-D7R^+ntI(<627Ug~H*`&{5TE|}F zyqwt;Jjiadn1ggb{E^*{Pf&8sFm!%o*%JydoqQzg3;k@nc|Wz}eowJ#v@l^vTxta< z-XR{-PRvQFsUT8xl&wA>Dgt|hX3XS6&mHb0iFZT|eNHQVMv5;-m_K13W9no*6d=HY zIb5C?_5D0(OW=>QYpUE&0jr*jQ0B zHBMN(jLX6cbkL4?;E(tC^3@HzaO8`uaU{1Iyf=aWq#PZ?(I{)ra)sDzeoi{;`q{WH z{NcS%p~!6-s{`P<4gO-plnq$!S>TpE{5s*w>K%;rn}jK`c4|@YPurnEzaKs| z)z-guI-kaBUD*}VTb>5>2(AiQ92sV_eOmsOK{%~~d)%MjtKb7JhmgPL;$&f1ffKR` z3a|+I#+BmW+`LJpWB8@Y!sn^DhL7mxt^?X<5rf1>w^F2UAA;*D^m3sM-G?(6sgx*% zKuFER-KDLBIop&0J~yb`i8UgR61YelsQ&7;N zLJkU9EmB$(t*JRutrmFfir@BJtD-0vQksmhSz&H^?#a*3Tl__LI$!y-)l*iwETKtH z!O10NEfyiSqeW zA2^_<|C+?U?1z2x27lI#5vMP}#*3!HJiUBT3{B~Ig zu{g7S>$mm6QO#(soe`;Juu9$o=kGMl6B@;isu)<|p|KY{y?k)yT|((EQanF{A9DTM zZRw&?i3@HJ%SX1}**YJIan5UjccKEQT>B&QC;Y6;PiC;AZiQ`{swpvbyA{UwptmTS zlthnXs$a{pNvtG8W#-Mb1ALX)l9xE!k~g8(=hMWnO;*W+0BY`j($>@V0~ZN=9HDOf zrXqD8I7?Qy$XLQwdk6GusPSo!F;cpWww(!E+ir?&dJ{o&?WOiRT;EMvEBwGwFko+G zujm;RZ~Rgk9y@k$Eg<>}JF)QXT7;eN z2oE3JBQ^WAG4Y5k#yW27eg2}}43C~|cz7e_0o_t~)Q{V?L)nSbIvo3l$l5rqd3*g^ zS^F~dH^O_r@|@1ZxOr!13^29~R-s&ZQYUT_z@U#mL6t6DmbgQh)VT4zB@@IIu()MN(q^JB>mzDNGNw1KBW>%A+d>OLw zu~&O~0h*#XOUBt%CI(=LWj|}SB%y)9Fxb3Dh4UJI5`DCKB;a&f3e^?6fEQ&uKHpNUCH=wRC(*kZ7@->+mrn#ZZ}l5}CYD_%zTm#ae)f>6XTbFw&uGqX>rzY|EiC%hy@agPCliSFiS~pV!{M+ zOk@}7RozhFnWb7%KOC*@KH0r(1wS~4&3QzZBfNK$I%1(J&gBbJSsG4kDE6(k>SC}N(D7MXgq%}KX?NiP5}!QF7& zxxyXGnMsb`6qEy8eGouRQS5|4vZ*|0%j_!l&Z7}PBQhTQal z8Gk%2Pvl2lG{_MuNDpi*V*E)~uCO$^!8A(IAe9nNm7}v#Djt+i;W#Z%dd#+guLq+d2!oZ8{O+LV-(FL z`nPB>;CJSJM&xf@ z6#JE?svwi5>h&~DOm};$ICJEQdDtEZ97XH&*eCGh-Lap+k46Psahq|_u$b@rai^tH z$B-s7TZ1b5=yGJKjf5x5+c*!DwdafLz2&#~ntsG#AXYsq?adKO#+JvS+p_~(?Vm9c ziqh+L{D;N5{VnJw+aQYQ?;qa&j1@Ewpb70fu#{(98#}*Whq3GJTdOHru>655aGe3P}q#`Hujngw6fY^+Gh? z3-VERydLH#kwSQ+u5x?3)E0!MY(*}W= z+O1{z$nC@vgDI?W2?-+J3--_!9M&?YelauZEzkU_@`-W1Bx}1Ok0OLGfiHzi1oyPe zux@m=HaizTWdK^V^s~p4(CV8mkmp)IOba>1b9pKatTIV@NEX`U_*%<^VEsQu33f`5hYj(ZJ z1GA{t*?rG7gF2RxFuWvf11Tw>A)u24qO-(dDNdJkn2wvX68*W+QaSIxpC7gyN%R>q z01E)0oW>>9)iVxYrve>xT5%Xf;oW=grs_k#^rDsCHna%IqFnPTnKCb$+QVJ-*>O** zA=Z0XLt6Tx7ATtBR4hnue&8`Ln=n#xgU%-S*NAjb>qM!r(%llk(8n+YGjh+O4^@*r zuM1@jDB&bT0ck%qWfL3Pe)Xj$s1D!$KAYey@BmiVc?ZogTG61G$soH+TkHcq4S+*; z-qJcNKV$TDfpx4a-RGMfc7NcZ3-s$}X9%Dv{6h0B3l$JVF~7c4bVVv)s1~_5#dH6l zy7U8LW*P6E$5O+)pmq~N)(szdChj4!>Y=P?bd3j2Dwbn>+4mwyO9s}VY?kHLef3d{ z8V%-5yKQoIC#KKQf39J5@Rjk_2Jf7y?|Qf+Pl}NrIJS|4ArJdwXBdZPO_{qD&6DcZ zseNV3Y%`oA)kE&l=EPkBejUkBnwt9jgV|fv@_9L+zI@u;-KjBpqxjI93k-KDM#J}5 z9#xKZOFUmaVxotD-NtstnL-@rW6me(Uw)+sG<12~!nb`Ny#=_ouTd+yZTeL~nomlL zQ}K$ZmI8&$`;=y#HelrN8MgAN${qvkd)DElwe?xT2k`^l)jd}_0!#{7GkY+~aKPwt ziJmN=^q$%dk!*_ageO_`X>~PV=hp0q1RtBIaoANmWTyE%JgqB@F1U=uifVtw+8p$?ekN@TptW6wP!O(dYYLo%XT+;g4X0-b01)Rdds7yF`sL@zvX6ugsAu6CS|~0%6sJU^}e+x#=s`JmfU~H3;A)LwW~y6 z+=*jK`2mYa+C2$H`Y@@D=iXdWK5KCb`MKTe5u9Ex`e%;7eYvAD8%_(k+fe%2ScR?S zA6qWB9y>}`_dmPbfjy+ztMr$5OzbC`>5)jk16OX0AYxcGs5?>Y(}&%XI}Z96*VXPY zP6vR7R})tB#+u!2RieJKoiKoJQ(k`q_z#g z9k?`*FfS9Vd@tW-ObuR6fqHAVYP4WU8{V&!_nN39<30Hmk-;6kY^}8rRHHw7+H1@#^q5Z z*A>7kSMCi4yXV^pBzHNDb3uq!#bFC<+~m-E>nob$NUpSPO?(2s-qUBVTIY8C?tJj+ z*xnaEBTn0{I`FeNrZGVxOJnIxrGHNAnx4xOMwfN6Pj49;ULj>6`wt>a2La^%#R${g z0h)?`A>m&b_&-qa>fg`5f|2Ax3-RaW>kpIuzaD=l(iZ_7sux;0|J{c9JGywe{zLWu zVB^0{|KvZu>C()Cynhw{fsG_2a{sF!A!$taW7fU?SMiT)}f2F K6m+bAd;bN{e;jK7 delta 4626 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 WqVz5LKi>hy%x?^LiMVL~8vY-PS*AAt diff --git a/gradlew.bat b/gradlew.bat index 9618d8d96..5093609d5 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% diff --git a/groovyw b/groovyw index b67153763..51a500ce3 100755 --- a/groovyw +++ b/groovyw @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -33,11 +49,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -66,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar:$APP_HOME/gradle/wrapper/groovy-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -109,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath @@ -138,35 +156,30 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GroovyWrapperMain config/groovy/util.groovy "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/groovyw.bat b/groovyw.bat index cc3ebf5e2..d2623ce34 100644 --- a/groovyw.bat +++ b/groovyw.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS= @@ -91,6 +110,7 @@ SET CMD_LINE_ARGS=%CMD_LINE_ARGS:~1% set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar;%APP_HOME%\gradle\wrapper\groovy-wrapper.jar; + @rem Execute Groovy via the Gradle Wrapper "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GroovyWrapperMain config/groovy/util.groovy %CMD_LINE_ARGS%