Skip to content

Commit d77eda5

Browse files
committed
Update Gradle wrapper scripts to fix classpath handling and copyright metadata
1 parent d51e96d commit d77eda5

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

exercises/practice/minesweeper/gradlew

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015 the original 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.
@@ -15,8 +15,6 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18-
# SPDX-License-Identifier: Apache-2.0
19-
#
2018

2119
##############################################################################
2220
#
@@ -57,7 +55,7 @@
5755
# Darwin, MinGW, and NonStop.
5856
#
5957
# (3) This script is generated from the Groovy template
60-
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
6159
# within the Gradle project.
6260
#
6361
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,7 +84,7 @@ done
8684
# shellcheck disable=SC2034
8785
APP_BASE_NAME=${0##*/}
8886
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -114,6 +112,7 @@ case "$( uname )" in #(
114112
NONSTOP* ) nonstop=true ;;
115113
esac
116114

115+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117116

118117

119118
# Determine the Java command to use to start the JVM.
@@ -171,6 +170,7 @@ fi
171170
# For Cygwin or MSYS, switch paths to Windows format before running java
172171
if "$cygwin" || "$msys" ; then
173172
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
173+
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
174174

175175
JAVACMD=$( cygpath --unix "$JAVACMD" )
176176

@@ -203,14 +203,15 @@ fi
203203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204204

205205
# Collect all arguments for the java command:
206-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207207
# and any embedded shellness will be escaped.
208208
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209209
# treated as '${Hostname}' itself on the command line.
210210

211211
set -- \
212212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
213-
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
213+
-classpath "$CLASSPATH" \
214+
org.gradle.wrapper.GradleWrapperMain \
214215
"$@"
215216

216217
# Stop when "xargs" is not available.
@@ -245,4 +246,4 @@ eval "set -- $(
245246
tr '\n' ' '
246247
)" '"$@"'
247248

248-
exec "$JAVACMD" "$@"
249+
exec "$JAVACMD" "$@"

exercises/practice/minesweeper/gradlew.bat

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16-
@rem SPDX-License-Identifier: Apache-2.0
17-
@rem
1816

1917
@if "%DEBUG%"=="" @echo off
2018
@rem ##########################################################################
@@ -70,10 +68,11 @@ goto fail
7068
:execute
7169
@rem Setup the command line
7270

71+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7372

7473

7574
@rem Execute Gradle
76-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
75+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
7776

7877
:end
7978
@rem End local scope for the variables with windows NT shell
@@ -90,4 +89,4 @@ exit /b %EXIT_CODE%
9089
:mainEnd
9190
if "%OS%"=="Windows_NT" endlocal
9291

93-
:omega
92+
:omega

0 commit comments

Comments
 (0)