Browse Source

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 <manikumar.reddy@gmail.com>
pull/12280/head
Ismael Juma 2 years ago committed by GitHub
parent
commit
8d65271a0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      gradle/dependencies.gradle
  2. 4
      gradle/wrapper/gradle-wrapper.properties
  3. 2
      gradlew
  4. 7
      retry_zinc

2
gradle/dependencies.gradle

@ -62,7 +62,7 @@ versions += [
checkstyle: "8.36.2", checkstyle: "8.36.2",
commonsCli: "1.4", commonsCli: "1.4",
dropwizardMetrics: "4.1.12.1", dropwizardMetrics: "4.1.12.1",
gradle: "7.5.1", gradle: "7.6",
grgit: "4.1.1", grgit: "4.1.1",
httpclient: "4.5.13", httpclient: "4.5.13",
easymock: "4.3", easymock: "4.3",

4
gradle/wrapper/gradle-wrapper.properties vendored

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219 distributionSha=312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
gradlew vendored

@ -118,7 +118,7 @@ esac
# Loop in case we encounter an error. # Loop in case we encounter an error.
for attempt in 1 2 3; do for attempt in 1 2 3; do
if [ ! -e "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" ]; then if [ ! -e "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" ]; then
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 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
rm -f "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" rm -f "$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
# Pause for a bit before looping in case the server throttled us. # Pause for a bit before looping in case the server throttled us.
sleep 5 sleep 5

7
retry_zinc

@ -28,17 +28,16 @@
# [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 # [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
set -uf -o pipefail set -uf -o pipefail
mkdir -p ./build mkdir -p logs
retryable=1 retryable=1
while [[ "$retryable" != 0 ]]; do while [[ "$retryable" != 0 ]]; do
retryable=0 retryable=0
rm -f ./build/buildoutput.log
"$@" 2>&1 | tee ./build/buildoutput.log "$@" 2>&1 | tee logs/buildoutput.log
commandReturnCode=$? commandReturnCode=$?
if [ $commandReturnCode -ne 0 ]; then if [ $commandReturnCode -ne 0 ]; then
if grep "Timeout waiting to lock zinc" ./build/buildoutput.log; then if grep "Timeout waiting to lock zinc" logs/buildoutput.log; then
retryable=1 retryable=1
echo 'Retrying due to zinc lock timeout' echo 'Retrying due to zinc lock timeout'
continue continue

Loading…
Cancel
Save