Skip to content

Commit 42bb36f

Browse files
donoghucmergify[bot]
authored andcommitted
Downgrade gradle to coninute testing on windows server 2016 (#18263)
* Downgrade gradle to coninute testing on windows server 2016 * REVERT ME! Temporarily force testing on win 2016 * Revert "REVERT ME! Temporarily force testing on win 2016" This reverts commit 079898b. * update gradle wrapper (cherry picked from commit 8a92bbb)
1 parent 587d256 commit 42bb36f

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

gradle/wrapper/gradle-wrapper.jar

-181 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# 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
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
9091

9192
# Use the maximum available, or set MAX_FD != -1 to use that value.
9293
MAX_FD=maximum
@@ -114,7 +115,7 @@ case "$( uname )" in #(
114115
NONSTOP* ) nonstop=true ;;
115116
esac
116117

117-
CLASSPATH="\\\"\\\""
118+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
118119

119120

120121
# Determine the Java command to use to start the JVM.
@@ -205,15 +206,15 @@ fi
205206
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206207

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

213214
set -- \
214215
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215216
-classpath "$CLASSPATH" \
216-
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217+
org.gradle.wrapper.GradleWrapperMain \
217218
"$@"
218219

219220
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=
73+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)