Skip to content

Commit 8d65271

Browse files
authored
MINOR: Update Gradle to 7.6 (#12918)
The highlights are: * Support for Java 19 * Support for incremental compilation following a compilation failure * Flag for individual task rerun (eg "gradle test --rerun") * Re-use Scala compiler between runs (will be enabled via #12280) Release notes: https://docs.gradle.org/7.6/release-notes.html Also adjusted the directory used by `retry_zinc` for the build output from `build` to `logs` as `gradlew clean` was causing unintended deletion of the file used by that tool to decide if a retry is required. Reviewers: Manikumar Reddy <[email protected]>
1 parent b2d8354 commit 8d65271

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

gradle/dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ versions += [
6262
checkstyle: "8.36.2",
6363
commonsCli: "1.4",
6464
dropwizardMetrics: "4.1.12.1",
65-
gradle: "7.5.1",
65+
gradle: "7.6",
6666
grgit: "4.1.1",
6767
httpclient: "4.5.13",
6868
easymock: "4.3",
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
3+
distributionSha=312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

gradlew

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ esac
118118
# Loop in case we encounter an error.
119119
for attempt in 1 2 3; do
120120
if [ ! -e "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" ]; then
121-
if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v7.5.1/gradle/wrapper/gradle-wrapper.jar"; then
121+
if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v7.6.0/gradle/wrapper/gradle-wrapper.jar"; then
122122
rm -f "$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
123123
# Pause for a bit before looping in case the server throttled us.
124124
sleep 5

retry_zinc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,16 @@
2828
# [2021-10-19T17:25:07.234Z] Lock file: /home/jenkins/.gradle/caches/7.0.2/zinc-1.3.5_2.13.6_8/zinc-1.3.5_2.13.6_8.lock
2929

3030
set -uf -o pipefail
31-
mkdir -p ./build
31+
mkdir -p logs
3232
retryable=1
3333
while [[ "$retryable" != 0 ]]; do
3434
retryable=0
35-
rm -f ./build/buildoutput.log
3635

37-
"$@" 2>&1 | tee ./build/buildoutput.log
36+
"$@" 2>&1 | tee logs/buildoutput.log
3837
commandReturnCode=$?
3938

4039
if [ $commandReturnCode -ne 0 ]; then
41-
if grep "Timeout waiting to lock zinc" ./build/buildoutput.log; then
40+
if grep "Timeout waiting to lock zinc" logs/buildoutput.log; then
4241
retryable=1
4342
echo 'Retrying due to zinc lock timeout'
4443
continue

0 commit comments

Comments
 (0)