Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit f9125bf

Browse files
oliemansmoliemansm
authored
Merge pull request #522 from BlasiusSecundus/feature/upgrade-to-gradle-6-8-1
chore: upgrade to Gradle 6.8.1
2 parents e06916d + 3a26155 commit f9125bf

File tree

2 files changed

+105
-104
lines changed

2 files changed

+105
-104
lines changed

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 104 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -26,157 +26,158 @@
2626
# Resolve links: $0 may be a link
2727
PRG="$0"
2828
# Need this for relative symlinks.
29-
while [ -h "$PRG" ]; do
30-
ls=$(ls -ld "$PRG")
31-
link=$(expr "$ls" : '.*-> \(.*\)$')
32-
if expr "$link" : '/.*' >/dev/null; then
33-
PRG="$link"
34-
else
35-
PRG=$(dirname "$PRG")"/$link"
36-
fi
29+
while [ -h "$PRG" ] ; do
30+
ls=`ls -ld "$PRG"`
31+
link=`expr "$ls" : '.*-> \(.*\)$'`
32+
if expr "$link" : '/.*' > /dev/null; then
33+
PRG="$link"
34+
else
35+
PRG=`dirname "$PRG"`"/$link"
36+
fi
3737
done
38-
SAVED="$(pwd)"
39-
cd "$(dirname \"$PRG\")/" >/dev/null
40-
APP_HOME="$(pwd -P)"
38+
SAVED="`pwd`"
39+
cd "`dirname \"$PRG\"`/" >/dev/null
40+
APP_HOME="`pwd -P`"
4141
cd "$SAVED" >/dev/null
4242

4343
APP_NAME="Gradle"
44-
APP_BASE_NAME=$(basename "$0")
44+
APP_BASE_NAME=`basename "$0"`
4545

4646
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
4747
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
4848

4949
# Use the maximum available, or set MAX_FD != -1 to use that value.
5050
MAX_FD="maximum"
5151

52-
warn() {
53-
echo "$*"
52+
warn () {
53+
echo "$*"
5454
}
5555

56-
die() {
57-
echo
58-
echo "$*"
59-
echo
60-
exit 1
56+
die () {
57+
echo
58+
echo "$*"
59+
echo
60+
exit 1
6161
}
6262

6363
# OS specific support (must be 'true' or 'false').
6464
cygwin=false
6565
msys=false
6666
darwin=false
6767
nonstop=false
68-
case "$(uname)" in
69-
CYGWIN*)
70-
cygwin=true
71-
;;
72-
Darwin*)
73-
darwin=true
74-
;;
75-
MINGW*)
76-
msys=true
77-
;;
78-
NONSTOP*)
79-
nonstop=true
80-
;;
68+
case "`uname`" in
69+
CYGWIN* )
70+
cygwin=true
71+
;;
72+
Darwin* )
73+
darwin=true
74+
;;
75+
MINGW* )
76+
msys=true
77+
;;
78+
NONSTOP* )
79+
nonstop=true
80+
;;
8181
esac
8282

8383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
8484

85+
8586
# Determine the Java command to use to start the JVM.
86-
if [ -n "$JAVA_HOME" ]; then
87-
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
88-
# IBM's JDK on AIX uses strange locations for the executables
89-
JAVACMD="$JAVA_HOME/jre/sh/java"
90-
else
91-
JAVACMD="$JAVA_HOME/bin/java"
92-
fi
93-
if [ ! -x "$JAVACMD" ]; then
94-
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
87+
if [ -n "$JAVA_HOME" ] ; then
88+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
89+
# IBM's JDK on AIX uses strange locations for the executables
90+
JAVACMD="$JAVA_HOME/jre/sh/java"
91+
else
92+
JAVACMD="$JAVA_HOME/bin/java"
93+
fi
94+
if [ ! -x "$JAVACMD" ] ; then
95+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
9596
9697
Please set the JAVA_HOME variable in your environment to match the
9798
location of your Java installation."
98-
fi
99+
fi
99100
else
100-
JAVACMD="java"
101-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
101+
JAVACMD="java"
102+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
102103
103104
Please set the JAVA_HOME variable in your environment to match the
104105
location of your Java installation."
105106
fi
106107

107108
# Increase the maximum file descriptors if we can.
108-
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ]; then
109-
MAX_FD_LIMIT=$(ulimit -H -n)
110-
if [ $? -eq 0 ]; then
111-
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
112-
MAX_FD="$MAX_FD_LIMIT"
113-
fi
114-
ulimit -n $MAX_FD
115-
if [ $? -ne 0 ]; then
116-
warn "Could not set maximum file descriptor limit: $MAX_FD"
109+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
110+
MAX_FD_LIMIT=`ulimit -H -n`
111+
if [ $? -eq 0 ] ; then
112+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
113+
MAX_FD="$MAX_FD_LIMIT"
114+
fi
115+
ulimit -n $MAX_FD
116+
if [ $? -ne 0 ] ; then
117+
warn "Could not set maximum file descriptor limit: $MAX_FD"
118+
fi
119+
else
120+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
117121
fi
118-
else
119-
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
120-
fi
121122
fi
122123

123124
# For Darwin, add options to specify how the application appears in the dock
124125
if $darwin; then
125-
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
126+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
126127
fi
127128

128129
# For Cygwin or MSYS, switch paths to Windows format before running java
129-
if [ "$cygwin" = "true" -o "$msys" = "true" ]; then
130-
APP_HOME=$(cygpath --path --mixed "$APP_HOME")
131-
CLASSPATH=$(cygpath --path --mixed "$CLASSPATH")
132-
133-
JAVACMD=$(cygpath --unix "$JAVACMD")
134-
135-
# We build the pattern for arguments to be converted via cygpath
136-
ROOTDIRSRAW=$(find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null)
137-
SEP=""
138-
for dir in $ROOTDIRSRAW; do
139-
ROOTDIRS="$ROOTDIRS$SEP$dir"
140-
SEP="|"
141-
done
142-
OURCYGPATTERN="(^($ROOTDIRS))"
143-
# Add a user-defined pattern to the cygpath arguments
144-
if [ "$GRADLE_CYGPATTERN" != "" ]; then
145-
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
146-
fi
147-
# Now convert the arguments - kludge to limit ourselves to /bin/sh
148-
i=0
149-
for arg in "$@"; do
150-
CHECK=$(echo "$arg" | egrep -c "$OURCYGPATTERN" -)
151-
CHECK2=$(echo "$arg" | egrep -c "^-") ### Determine if an option
152-
153-
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ]; then ### Added a condition
154-
eval $(echo args$i)=$(cygpath --path --ignore --mixed "$arg")
155-
else
156-
eval $(echo args$i)="\"$arg\""
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
134+
JAVACMD=`cygpath --unix "$JAVACMD"`
135+
136+
# We build the pattern for arguments to be converted via cygpath
137+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
138+
SEP=""
139+
for dir in $ROOTDIRSRAW ; do
140+
ROOTDIRS="$ROOTDIRS$SEP$dir"
141+
SEP="|"
142+
done
143+
OURCYGPATTERN="(^($ROOTDIRS))"
144+
# Add a user-defined pattern to the cygpath arguments
145+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
146+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
157147
fi
158-
i=$(expr $i + 1)
159-
done
160-
case $i in
161-
0) set -- ;;
162-
1) set -- "$args0" ;;
163-
2) set -- "$args0" "$args1" ;;
164-
3) set -- "$args0" "$args1" "$args2" ;;
165-
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
166-
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
167-
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
168-
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
169-
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
170-
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
171-
esac
148+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
149+
i=0
150+
for arg in "$@" ; do
151+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
152+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
153+
154+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
155+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
156+
else
157+
eval `echo args$i`="\"$arg\""
158+
fi
159+
i=`expr $i + 1`
160+
done
161+
case $i in
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
172+
esac
172173
fi
173174

174175
# Escape application args
175-
save() {
176-
for i; do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/"; done
177-
echo " "
176+
save () {
177+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
178+
echo " "
178179
}
179-
APP_ARGS=$(save "$@")
180+
APP_ARGS=`save "$@"`
180181

181182
# Collect all arguments for the java command, following the shell quoting and substitution rules
182183
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

0 commit comments

Comments
 (0)