Skip to content

Commit 55ad351

Browse files
committed
Update Gradle to 8.4
1 parent 98f29e4 commit 55ad351

File tree

4 files changed

+25
-23
lines changed

4 files changed

+25
-23
lines changed

build.gradle

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ if (hasProperty('buildScan')) {
6060
// you may use IntelliJ's project configuration to make it use the gradle version defined in the gradle script's wrapper section
6161
wrapper {
6262
// Update using:
63-
// ./gradlew wrapper --gradle-version=7.5.1 --distribution-type=bin
64-
gradleVersion = '7.6.2'
63+
// ./gradlew wrapper --gradle-version=8.4 --distribution-type=bin
64+
gradleVersion = '8.4'
6565
}
6666

6767
def buildTimeAndDate = OffsetDateTime.now()
@@ -169,12 +169,7 @@ allprojects {
169169

170170
Project commonProject = project(':grpc-common-spring-boot')
171171

172-
String javaAPIdoc
173-
if (JavaVersion.current().isJava9Compatible()) {
174-
javaAPIdoc = 'https://docs.oracle.com/en/java/javase/11/docs/api'
175-
} else {
176-
javaAPIdoc = 'https://docs.oracle.com/javase/8/docs/api/'
177-
}
172+
String javaAPIdoc = 'https://docs.oracle.com/en/java/javase/17/docs/api'
178173

179174
allprojects { project ->
180175
buildscript {
@@ -197,6 +192,7 @@ allprojects { project ->
197192
springFrameworkVersion = dependencyManagement.importedProperties['spring-framework.version']
198193
springSecurityVersion = dependencyManagement.importedProperties['spring-security.version']
199194
springCloudCommonsVersion = dependencyManagement.importedProperties['spring-cloud-commons.version']
195+
braveInstrumentationGrpc = dependencyManagement.importedProperties['brave.version']
200196
}
201197
}
202198

@@ -250,8 +246,8 @@ allprojects { project ->
250246
'https://docs.spring.io/spring-security/site/docs/' + springSecurityVersion + '/api/',
251247
'https://docs.spring.io/spring-boot/docs/' + springBootVersion + '/api/',
252248
'https://static.javadoc.io/org.springframework.cloud/spring-cloud-commons/' + springCloudCommonsVersion + '/',
253-
// 'https://static.javadoc.io/io.zipkin.brave/brave/' + braveInstrumentationGrpc + '/', // Requires javadoc 11
254-
// 'https://static.javadoc.io/io.zipkin.brave/brave-instrumentation-grpc/' + braveInstrumentationGrpc + '/', // Requires javadoc 11
249+
'https://static.javadoc.io/io.zipkin.brave/brave/' + braveInstrumentationGrpc + '/',
250+
'https://static.javadoc.io/io.zipkin.brave/brave-instrumentation-grpc/' + braveInstrumentationGrpc + '/',
255251
'https://google.github.io/guava/releases/29.0-android/api/docs/'
256252
]
257253
}

gradle/wrapper/gradle-wrapper.jar

2.05 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
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
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
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.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
143144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
146147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
148149
MAX_FD=$( ulimit -H -n ) ||
149150
warn "Could not query maximum file descriptor limit"
150151
esac
151152
case $MAX_FD in #(
152153
'' | soft) :;; #(
153154
*)
154155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
156157
ulimit -n "$MAX_FD" ||
157158
warn "Could not set maximum file descriptor limit to $MAX_FD"
158159
esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
197198
done
198199
fi
199200

200-
# Collect all arguments for the java command;
201-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202-
# shell script including quotes and variable substitutions, so put them in
203-
# double quotes to make sure that they get re-expanded; and
204-
# * put everything else in single quotes, so that it's not re-expanded.
201+
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"'
204+
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.
205210

206211
set -- \
207212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

0 commit comments

Comments
 (0)