Skip to content

Commit 48d2eda

Browse files
JoseLionjdneo
andauthored
feat(compat): Bump Gradle Wrapper to v8.5 and change Java 21 min Gradle version (#1455)
Co-authored-by: Sheng Chen <sheche@microsoft.com>
1 parent e1cf562 commit 48d2eda

File tree

22 files changed

+767
-546
lines changed

22 files changed

+767
-546
lines changed

extension/jdtls.ext/com.microsoft.gradle.bs.importer.target/com.microsoft.gradle.bs.importer.tp.target

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
1616
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
1717
<unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
18-
<repository location="https://download.eclipse.org/releases/2023-12/202311171000/"/>
18+
<repository location="https://download.eclipse.org/releases/2023-12/202312061001/"/>
1919
</location>
2020
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
2121
<unit id="org.eclipse.jdt.ls.core" version="0.0.0"/>

extension/jdtls.ext/com.microsoft.gradle.bs.importer/src/com/microsoft/gradle/bs/importer/GradleBuildServerBuildSupport.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,9 @@ private List<IClasspathEntry> getDependencyJars(DependencyModulesResult dependen
654654
*/
655655
private String getHighestCompatibleJavaVersion(String gradleVersion) {
656656
GradleVersion version = GradleVersion.version(gradleVersion);
657-
if (version.compareTo(GradleVersion.version("8.3")) >= 0) {
657+
if (version.compareTo(GradleVersion.version("8.5")) >= 0) {
658+
return JavaCore.VERSION_21;
659+
} else if (version.compareTo(GradleVersion.version("8.3")) >= 0) {
658660
return JavaCore.VERSION_20;
659661
} else if (version.compareTo(GradleVersion.version("7.6")) >= 0) {
660662
return JavaCore.VERSION_19;
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/usr/bin/env sh
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,111 @@
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/HEAD/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 $link in #(
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
4282

43-
APP_NAME="Gradle"
44-
APP_BASE_NAME=`basename "$0"`
45-
46-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
83+
# This is normally unused
84+
# shellcheck disable=SC2034
85+
APP_BASE_NAME=${0##*/}
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
4888

4989
# Use the maximum available, or set MAX_FD != -1 to use that value.
50-
MAX_FD="maximum"
90+
MAX_FD=maximum
5191

5292
warn () {
5393
echo "$*"
54-
}
94+
} >&2
5595

5696
die () {
5797
echo
5898
echo "$*"
5999
echo
60100
exit 1
61-
}
101+
} >&2
62102

63103
# OS specific support (must be 'true' or 'false').
64104
cygwin=false
65105
msys=false
66106
darwin=false
67107
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-
;;
108+
case "$( uname )" in #(
109+
CYGWIN* ) cygwin=true ;; #(
110+
Darwin* ) darwin=true ;; #(
111+
MSYS* | MINGW* ) msys=true ;; #(
112+
NONSTOP* ) nonstop=true ;;
81113
esac
82114

83115
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
84116

117+
85118
# Determine the Java command to use to start the JVM.
86119
if [ -n "$JAVA_HOME" ] ; then
87120
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
88121
# IBM's JDK on AIX uses strange locations for the executables
89-
JAVACMD="$JAVA_HOME/jre/sh/java"
122+
JAVACMD=$JAVA_HOME/jre/sh/java
90123
else
91-
JAVACMD="$JAVA_HOME/bin/java"
124+
JAVACMD=$JAVA_HOME/bin/java
92125
fi
93126
if [ ! -x "$JAVACMD" ] ; then
94127
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,92 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
97130
location of your Java installation."
98131
fi
99132
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.
133+
JAVACMD=java
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
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."
140+
fi
105141
fi
106142

107143
# 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
144+
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145+
case $MAX_FD in #(
146+
max*)
147+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148+
# shellcheck disable=SC2039,SC3045
149+
MAX_FD=$( ulimit -H -n ) ||
150+
warn "Could not query maximum file descriptor limit"
151+
esac
152+
case $MAX_FD in #(
153+
'' | soft) :;; #(
154+
*)
155+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156+
# shellcheck disable=SC2039,SC3045
157+
ulimit -n "$MAX_FD" ||
158+
warn "Could not set maximum file descriptor limit to $MAX_FD"
159+
esac
121160
fi
122161

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
162+
# Collect all arguments for the java command, stacking in reverse order:
163+
# * args from the command line
164+
# * the main class name
165+
# * -classpath
166+
# * -D...appname settings
167+
# * --module-path (only if needed)
168+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
127169

128170
# 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 d 2>/dev/null`
136-
SEP=""
137-
for dir in $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
171+
if "$cygwin" || "$msys" ; then
172+
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
173+
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
174+
175+
JAVACMD=$( cygpath --unix "$JAVACMD" )
176+
146177
# Now convert the arguments - kludge to limit ourselves to /bin/sh
147-
i=0
148-
for arg in "$@" ; 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\""
178+
for arg do
179+
if
180+
case $arg in #(
181+
-*) false ;; # don't mess with options #(
182+
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
183+
[ -e "$t" ] ;; #(
184+
*) false ;;
185+
esac
186+
then
187+
arg=$( cygpath --path --ignore --mixed "$arg" )
156188
fi
157-
i=$((i+1))
189+
# Roll the args list around exactly as many times as the number of
190+
# args, so each arg winds up back in the position where it started, but
191+
# possibly modified.
192+
#
193+
# NB: a `for` loop captures its iteration list before it begins, so
194+
# changing the positional parameters here affects neither the number of
195+
# iterations, nor the values presented in `arg`.
196+
shift # remove old arg
197+
set -- "$@" "$arg" # push replacement arg
158198
done
159-
case $i in
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
171199
fi
172200

173-
# Escape application args
174-
save () {
175-
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176-
echo " "
177-
}
178-
APP_ARGS=$(save "$@")
179201

180-
# Collect all arguments for the java command, following the shell quoting and substitution rules
181-
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
182204

183-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
184-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
185-
cd "$(dirname "$0")"
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
210+
211+
set -- \
212+
"-Dorg.gradle.appname=$APP_BASE_NAME" \
213+
-classpath "$CLASSPATH" \
214+
org.gradle.wrapper.GradleWrapperMain \
215+
"$@"
216+
217+
# Stop when "xargs" is not available.
218+
if ! command -v xargs >/dev/null 2>&1
219+
then
220+
die "xargs is not available"
186221
fi
187222

223+
# Use "xargs" to parse quoted args.
224+
#
225+
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
226+
#
227+
# In Bash we could simply go:
228+
#
229+
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
230+
# set -- "${ARGS[@]}" "$@"
231+
#
232+
# but POSIX shell has neither arrays nor command substitution, so instead we
233+
# post-process each arg (as a line of input to sed) to backslash-escape any
234+
# character that might be a shell metacharacter, then use eval to reverse
235+
# that process (while maintaining the separation between arguments), and wrap
236+
# the whole thing up as a single "set" statement.
237+
#
238+
# This will of course break if any of these variables contains a newline or
239+
# an unmatched quote.
240+
#
241+
242+
eval "set -- $(
243+
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
244+
xargs -n1 |
245+
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
246+
tr '\n' ' '
247+
)" '"$@"'
248+
188249
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)