This is an automated email from the ASF dual-hosted git repository.
etudenhoefner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/main by this push:
new 565352d12b Build: Upgrade to gradle 8.8 (#8486)
565352d12b is described below
commit 565352d12be30735d9224f894099defd6cd45b09
Author: JB Onofré <[email protected]>
AuthorDate: Tue Jun 25 17:29:23 2024 +0200
Build: Upgrade to gradle 8.8 (#8486)
---
build.gradle | 8 ++++++--
gradle/wrapper/gradle-wrapper.properties | 5 ++---
gradlew | 24 ++++++++++++++----------
3 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/build.gradle b/build.gradle
index 9b3c352705..64396585de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,7 @@ buildscript {
classpath 'me.champeau.jmh:jmh-gradle-plugin:0.7.2'
classpath 'gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6'
classpath "com.github.alisiikh:gradle-scalastyle-plugin:3.5.0"
- classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0'
+ classpath 'io.github.nastra.gradle.revapi:gradle-revapi:1.8.1'
classpath 'com.gorylenko.gradle-git-properties:gradle-git-properties:2.4.2'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.1.0'
classpath 'org.openapitools:openapi-generator-gradle-plugin:6.6.0'
@@ -139,7 +139,7 @@ subprojects {
apply plugin: 'java-library'
if (project.name in REVAPI_PROJECTS) {
- apply plugin: 'com.palantir.revapi'
+ apply plugin: 'io.github.nastra.revapi'
revapi {
oldGroup = project.group
oldName = project.name
@@ -165,6 +165,10 @@ subprojects {
rootTask.finalizedBy showDeprecationRulesOnRevApiFailure
}
}
+
+ tasks.named("revapiAnalyze").configure {
+ dependsOn(":iceberg-common:jar")
+ }
}
configurations {
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index 4a0a58d550..d296387b57 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-# checksum was taken from https://gradle.org/release-checksums
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 0c913deb55..68bbcf0a5c 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-#
https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#
https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +83,11 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set
(https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
if [ ! -e $APP_HOME/gradle/wrapper/gradle-wrapper.jar ]; then
- curl -o $APP_HOME/gradle/wrapper/gradle-wrapper.jar
https://raw.githubusercontent.com/gradle/gradle/v8.1.1/gradle/wrapper/gradle-wrapper.jar
+ curl -o $APP_HOME/gradle/wrapper/gradle-wrapper.jar
https://raw.githubusercontent.com/gradle/gradle/v8.8.0/gradle/wrapper/gradle-wrapper.jar
fi
# Use the maximum available, or set MAX_FD != -1 to use that value.
@@ -134,10 +135,13 @@ location of your Java installation."
fi
else
JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no
'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found
in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
+ fi
fi
# Increase the maximum file descriptors if we can.
@@ -145,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is
checked to see if it worked.
- # shellcheck disable=SC3045
+ # shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
@@ -153,7 +157,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is
checked to see if it worked.
- # shellcheck disable=SC3045
+ # shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -202,11 +206,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to
pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not
allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is
an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
