Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitacc94d3

Browse files
committed
Switch to Gradle 7.1.1
preparing to switch to Kotlin 1.6
1 parent70d50b5 commitacc94d3

File tree

4 files changed

+162
-122
lines changed

4 files changed

+162
-122
lines changed

‎gradle/wrapper/gradle-wrapper.jar

841 Bytes
Binary file not shown.
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.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 154 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/usr/bin/envsh
1+
#!/bin/sh
22

33
#
4-
# Copyright 2015 the original author or authors.
4+
# Copyright?2015-2021 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -17,78 +17,113 @@
1717
#
1818

1919
##############################################################################
20-
##
21-
## Gradle start up script for UN*X
22-
##
20+
#
21+
# Gradle start up script for POSIX generated by Gradle.
22+
#
23+
# Important for running:
24+
#
25+
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
26+
# noncompliant, but you have some other compliant shell such as ksh or
27+
# bash, then to run this script, type that shell name before the whole
28+
# command line, like:
29+
#
30+
# ksh Gradle
31+
#
32+
# Busybox and similar reduced shells will NOT work, because this script
33+
# requires all of these POSIX shell features:
34+
# * functions;
35+
# * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?,
36+
# ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?;
37+
# * compound commands having a testable exit status, especially ?case?;
38+
# * various built-in commands including ?command?, ?set?, and ?ulimit?.
39+
#
40+
# Important for patching:
41+
#
42+
# (2) This script targets any POSIX shell, so it avoids extensions provided
43+
# by Bash, Ksh, etc; in particular arrays are avoided.
44+
#
45+
# The "traditional" practice of packing multiple parameters into a
46+
# space-separated string is a well documented source of bugs and security
47+
# problems, so this is (mostly) avoided, by progressively accumulating
48+
# options in "$@", and eventually passing that to Java.
49+
#
50+
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
51+
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
52+
# see the in-line comments for details.
53+
#
54+
# There are tweaks for specific operating systems such as AIX, CygWin,
55+
# Darwin, MinGW, and NonStop.
56+
#
57+
# (3) This script is generated from the Groovy template
58+
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
59+
# within the Gradle project.
60+
#
61+
# You can find Gradle at https://github.com/gradle/gradle/.
62+
#
2363
##############################################################################
2464

2565
# Attempt to set APP_HOME
66+
2667
# Resolve links: $0 may be a link
27-
PRG="$0"
28-
# 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
68+
app_path=$0
69+
70+
# Need this for daisy-chained symlinks.
71+
while
72+
APP_HOME=${app_path%"${app_path##*/}"}# leaves a trailing /; empty if no leading path
73+
[-h"$app_path" ]
74+
do
75+
ls=$( ls -ld"$app_path")
76+
link=${ls#*' ->'}
77+
case$linkin#(
78+
/*) app_path=$link ;;#(
79+
*) app_path=$APP_HOME$link ;;
80+
esac
3781
done
38-
SAVED="`pwd`"
39-
cd"`dirname\"$PRG\"`/">/dev/null
40-
APP_HOME="`pwd -P`"
41-
cd"$SAVED">/dev/null
82+
83+
APP_HOME=$(cd"${APP_HOME:-./}"&&pwd -P)||exit
4284

4385
APP_NAME="Gradle"
44-
APP_BASE_NAME=`basename"$0"`
86+
APP_BASE_NAME=${0##*/}
4587

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

4991
# Use the maximum available, or set MAX_FD != -1 to use that value.
50-
MAX_FD="maximum"
92+
MAX_FD=maximum
5193

5294
warn () {
5395
echo"$*"
54-
}
96+
}>&2
5597

5698
die () {
5799
echo
58100
echo"$*"
59101
echo
60102
exit 1
61-
}
103+
}>&2
62104

63105
# OS specific support (must be 'true' or 'false').
64106
cygwin=false
65107
msys=false
66108
darwin=false
67109
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-
;;
110+
case"$( uname)"in#(
111+
CYGWIN* ) cygwin=true ;;#(
112+
Darwin* ) darwin=true ;;#(
113+
MSYS* | MINGW* ) msys=true ;;#(
114+
NONSTOP* ) nonstop=true ;;
81115
esac
82116

83117
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
84118

119+
85120
# Determine the Java command to use to start the JVM.
86121
if [-n"$JAVA_HOME" ];then
87122
if [-x"$JAVA_HOME/jre/sh/java" ];then
88123
# IBM's JDK on AIX uses strange locations for the executables
89-
JAVACMD="$JAVA_HOME/jre/sh/java"
124+
JAVACMD=$JAVA_HOME/jre/sh/java
90125
else
91-
JAVACMD="$JAVA_HOME/bin/java"
126+
JAVACMD=$JAVA_HOME/bin/java
92127
fi
93128
if [!-x"$JAVACMD" ];then
94129
die"ERROR: JAVA_HOME is set to an invalid directory:$JAVA_HOME
@@ -97,87 +132,103 @@ Please set the JAVA_HOME variable in your environment to match the
97132
location of your Java installation."
98133
fi
99134
else
100-
JAVACMD="java"
135+
JAVACMD=java
101136
which java>/dev/null2>&1|| die"ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
102137
103138
Please set the JAVA_HOME variable in your environment to match the
104139
location of your Java installation."
105140
fi
106141

107142
# 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"
117-
fi
118-
else
119-
warn"Could not query maximum file descriptor limit:$MAX_FD_LIMIT"
120-
fi
143+
if!"$cygwin"&&!"$darwin"&&!"$nonstop";then
144+
case$MAX_FDin#(
145+
max*)
146+
MAX_FD=$(ulimit -H -n)||
147+
warn"Could not query maximum file descriptor limit"
148+
esac
149+
case$MAX_FDin#(
150+
'' | soft):;;#(
151+
*)
152+
ulimit -n"$MAX_FD"||
153+
warn"Could not set maximum file descriptor limit to$MAX_FD"
154+
esac
121155
fi
122156

123-
# For Darwin, add options to specify how the application appears in the dock
124-
if$darwin;then
125-
GRADLE_OPTS="$GRADLE_OPTS\"-Xdock:name=$APP_NAME\"\"-Xdock:icon=$APP_HOME/media/gradle.icns\""
126-
fi
157+
# Collect all arguments for the java command, stacking in reverse order:
158+
# * args from the command line
159+
# * the main class name
160+
# * -classpath
161+
# * -D...appname settings
162+
# * --module-path (only if needed)
163+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
127164

128165
# 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-
JAVACMD=`cygpath --unix"$JAVACMD"`
133-
134-
# We build the pattern for arguments to be converted via cygpath
135-
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d2>/dev/null`
136-
SEP=""
137-
fordirin$ROOTDIRSRAW;do
138-
ROOTDIRS="$ROOTDIRS$SEP$dir"
139-
SEP="|"
140-
done
141-
OURCYGPATTERN="(^($ROOTDIRS))"
142-
# Add a user-defined pattern to the cygpath arguments
143-
if ["$GRADLE_CYGPATTERN"!="" ];then
144-
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
145-
fi
166+
if"$cygwin"||"$msys";then
167+
APP_HOME=$( cygpath --path --mixed"$APP_HOME")
168+
CLASSPATH=$( cygpath --path --mixed"$CLASSPATH")
169+
170+
JAVACMD=$( cygpath --unix"$JAVACMD")
171+
146172
# Now convert the arguments - kludge to limit ourselves to /bin/sh
147-
i=0
148-
forargin"$@";do
149-
CHECK=`echo"$arg"|egrep -c"$OURCYGPATTERN" -`
150-
CHECK2=`echo"$arg"|egrep -c"^-"`### Determine if an option
151-
152-
if [$CHECK-ne 0 ]&& [$CHECK2-eq 0 ];then### Added a condition
153-
eval`echo args$i`=`cygpath --path --ignore --mixed"$arg"`
154-
else
155-
eval`echo args$i`="\"$arg\""
173+
for argdo
174+
if
175+
case$argin#(
176+
-*)false ;;# don't mess with options #(
177+
/?*) t=${arg#/} t=/${t%%/*}# looks like a POSIX filepath
178+
[-e"$t" ] ;;#(
179+
*)false ;;
180+
esac
181+
then
182+
arg=$( cygpath --path --ignore --mixed"$arg")
156183
fi
157-
i=`expr$i + 1`
184+
# Roll the args list around exactly as many times as the number of
185+
# args, so each arg winds up back in the position where it started, but
186+
# possibly modified.
187+
#
188+
# NB: a `for` loop captures its iteration list before it begins, so
189+
# changing the positional parameters here affects neither the number of
190+
# iterations, nor the values presented in `arg`.
191+
shift# remove old arg
192+
set --"$@""$arg"# push replacement arg
158193
done
159-
case$iin
160-
0)set -- ;;
161-
1)set --"$args0" ;;
162-
2)set --"$args0""$args1" ;;
163-
3)set --"$args0""$args1""$args2" ;;
164-
4)set --"$args0""$args1""$args2""$args3" ;;
165-
5)set --"$args0""$args1""$args2""$args3""$args4" ;;
166-
6)set --"$args0""$args1""$args2""$args3""$args4""$args5" ;;
167-
7)set --"$args0""$args1""$args2""$args3""$args4""$args5""$args6" ;;
168-
8)set --"$args0""$args1""$args2""$args3""$args4""$args5""$args6""$args7" ;;
169-
9)set --"$args0""$args1""$args2""$args3""$args4""$args5""$args6""$args7""$args8" ;;
170-
esac
171194
fi
172195

173-
# Escape application args
174-
save () {
175-
for idoprintf %s\\n"$i"| sed"s/'/'\\\\''/g;1s/^/'/;\$s/\$/'\\\\/";done
176-
echo""
177-
}
178-
APP_ARGS=`save"$@"`
196+
# Collect all arguments for the java command;
197+
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198+
# shell script including quotes and variable substitutions, so put them in
199+
# double quotes to make sure that they get re-expanded; and
200+
# * put everything else in single quotes, so that it's not re-expanded.
201+
202+
set -- \
203+
"-Dorg.gradle.appname=$APP_BASE_NAME" \
204+
-classpath"$CLASSPATH" \
205+
org.gradle.wrapper.GradleWrapperMain \
206+
"$@"
207+
208+
# Use "xargs" to parse quoted args.
209+
#
210+
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
211+
#
212+
# In Bash we could simply go:
213+
#
214+
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
215+
# set -- "${ARGS[@]}" "$@"
216+
#
217+
# but POSIX shell has neither arrays nor command substitution, so instead we
218+
# post-process each arg (as a line of input to sed) to backslash-escape any
219+
# character that might be a shell metacharacter, then use eval to reverse
220+
# that process (while maintaining the separation between arguments), and wrap
221+
# the whole thing up as a single "set" statement.
222+
#
223+
# This will of course break if any of these variables contains a newline or
224+
# an unmatched quote.
225+
#
179226

180-
# Collect all arguments for the java command, following the shell quoting and substitution rules
181-
evalset --$DEFAULT_JVM_OPTS$JAVA_OPTS$GRADLE_OPTS"\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath"\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain"$APP_ARGS"
227+
eval"set --$(
228+
printf'%s\n'"$DEFAULT_JVM_OPTS$JAVA_OPTS$GRADLE_OPTS"|
229+
xargs -n1|
230+
sed' s~[^-[:alnum:]+,./:=@_]~\\&~g;'|
231+
tr'\n'''
232+
)"'"$@"'
182233

183234
exec"$JAVACMD""$@"

‎gradlew.bat

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
2929
setAPP_BASE_NAME=%~n0
3030
setAPP_HOME=%DIRNAME%
3131

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for%%iin ("%APP_HOME%")dosetAPP_HOME=%%~fi
34+
3235
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
3336
setDEFAULT_JVM_OPTS="-Xmx64m""-Xms64m"
3437

@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
3740

3841
setJAVA_EXE=java.exe
3942
%JAVA_EXE% -version>NUL2>&1
40-
if"%ERRORLEVEL%"=="0"gotoinit
43+
if"%ERRORLEVEL%"=="0"gotoexecute
4144

4245
echo.
4346
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
5154
setJAVA_HOME=%JAVA_HOME:"=%
5255
setJAVA_EXE=%JAVA_HOME%/bin/java.exe
5356

54-
ifexist"%JAVA_EXE%"gotoinit
57+
ifexist"%JAVA_EXE%"gotoexecute
5558

5659
echo.
5760
echo ERROR: JAVA_HOME is set to an invalid directory:%JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
6164

6265
goto fail
6366

64-
:init
65-
@rem Get command-line arguments, handling Windows variants
66-
67-
ifnot"%OS%"=="Windows_NT"goto win9xME_args
68-
69-
:win9xME_args
70-
@rem Slurp the command line arguments.
71-
setCMD_LINE_ARGS=
72-
set_SKIP=2
73-
74-
:win9xME_args_slurp
75-
if"x%~1"=="x"goto execute
76-
77-
setCMD_LINE_ARGS=%*
78-
7967
:execute
8068
@rem Setup the command line
8169

8270
setCLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8371

72+
8473
@rem Execute Gradle
85-
"%JAVA_EXE%"%DEFAULT_JVM_OPTS%%JAVA_OPTS%%GRADLE_OPTS%"-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath"%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain%CMD_LINE_ARGS%
74+
"%JAVA_EXE%"%DEFAULT_JVM_OPTS%%JAVA_OPTS%%GRADLE_OPTS%"-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath"%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain%*
8675

8776
:end
8877
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp