Skip to content

Commit 565352d

Browse files
authored
Build: Upgrade to gradle 8.8 (#8486)
1 parent 4bd9e64 commit 565352d

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ buildscript {
3838
classpath 'me.champeau.jmh:jmh-gradle-plugin:0.7.2'
3939
classpath 'gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6'
4040
classpath "com.github.alisiikh:gradle-scalastyle-plugin:3.5.0"
41-
classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0'
41+
classpath 'io.github.nastra.gradle.revapi:gradle-revapi:1.8.1'
4242
classpath 'com.gorylenko.gradle-git-properties:gradle-git-properties:2.4.2'
4343
classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.1.0'
4444
classpath 'org.openapitools:openapi-generator-gradle-plugin:6.6.0'
@@ -139,7 +139,7 @@ subprojects {
139139
apply plugin: 'java-library'
140140

141141
if (project.name in REVAPI_PROJECTS) {
142-
apply plugin: 'com.palantir.revapi'
142+
apply plugin: 'io.github.nastra.revapi'
143143
revapi {
144144
oldGroup = project.group
145145
oldName = project.name
@@ -165,6 +165,10 @@ subprojects {
165165
rootTask.finalizedBy showDeprecationRulesOnRevApiFailure
166166
}
167167
}
168+
169+
tasks.named("revapiAnalyze").configure {
170+
dependsOn(":iceberg-common:jar")
171+
}
168172
}
169173

170174
configurations {
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
# checksum was taken from https://gradle.org/release-checksums
4-
distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
65
networkTimeout=10000
76
zipStoreBase=GRADLE_USER_HOME
87
zipStorePath=wrapper/dists

gradlew

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (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
58+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +83,11 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
8687
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8788

8889
if [ ! -e $APP_HOME/gradle/wrapper/gradle-wrapper.jar ]; then
89-
curl -o $APP_HOME/gradle/wrapper/gradle-wrapper.jar https://raw.githubusercontent.com/gradle/gradle/v8.1.1/gradle/wrapper/gradle-wrapper.jar
90+
curl -o $APP_HOME/gradle/wrapper/gradle-wrapper.jar https://raw.githubusercontent.com/gradle/gradle/v8.8.0/gradle/wrapper/gradle-wrapper.jar
9091
fi
9192

9293
# Use the maximum available, or set MAX_FD != -1 to use that value.
@@ -134,26 +135,29 @@ location of your Java installation."
134135
fi
135136
else
136137
JAVACMD=java
137-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
138+
if ! command -v java >/dev/null 2>&1
139+
then
140+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
138141
139142
Please set the JAVA_HOME variable in your environment to match the
140143
location of your Java installation."
144+
fi
141145
fi
142146

143147
# Increase the maximum file descriptors if we can.
144148
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145149
case $MAX_FD in #(
146150
max*)
147151
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC3045
152+
# shellcheck disable=SC2039,SC3045
149153
MAX_FD=$( ulimit -H -n ) ||
150154
warn "Could not query maximum file descriptor limit"
151155
esac
152156
case $MAX_FD in #(
153157
'' | soft) :;; #(
154158
*)
155159
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC3045
160+
# shellcheck disable=SC2039,SC3045
157161
ulimit -n "$MAX_FD" ||
158162
warn "Could not set maximum file descriptor limit to $MAX_FD"
159163
esac
@@ -202,11 +206,11 @@ fi
202206
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203207
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204208

205-
# Collect all arguments for the java command;
206-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
207-
# shell script including quotes and variable substitutions, so put them in
208-
# double quotes to make sure that they get re-expanded; and
209-
# * put everything else in single quotes, so that it's not re-expanded.
209+
# Collect all arguments for the java command:
210+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
211+
# and any embedded shellness will be escaped.
212+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
213+
# treated as '${Hostname}' itself on the command line.
210214

211215
set -- \
212216
"-Dorg.gradle.appname=$APP_BASE_NAME" \

0 commit comments

Comments
 (0)