You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2023/12/22 18:48:01 UTC
(groovy) branch danielsun/bump_gradle85 created (now b897cb2215)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch danielsun/bump_gradle85
in repository https://gitbox.apache.org/repos/asf/groovy.git
at b897cb2215 Bump gradle to 8.5
This branch includes the following new commits:
new b897cb2215 Bump gradle to 8.5
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(groovy) 01/01: Bump gradle to 8.5
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/bump_gradle85
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit b897cb2215262295f32defc3e626309f17c8ad1e
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Dec 23 02:47:47 2023 +0800
Bump gradle to 8.5
---
build.gradle | 4 ++++
gradle.properties | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 62076 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 11 ++++++-----
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/build.gradle b/build.gradle
index 3de27101c5..e88afda815 100644
--- a/build.gradle
+++ b/build.gradle
@@ -266,3 +266,7 @@ tasks.named("dependencyUpdates")?.configure {
!(it.currentVersion.toLowerCase() ==~ UNSTABLE) && it.candidate.version.toLowerCase() ==~ UNSTABLE
}
}
+
+artifacts {
+ grapesRuntimeElements file: jar.archiveFile.get().asFile, type: 'jar'
+}
diff --git a/gradle.properties b/gradle.properties
index 0b143764f2..e802949d05 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ groovyTargetBytecodeVersion=11
targetJavaVersion=11
binaryCompatibilityBaseline=4.0.11
-gradle_version=8.1.1
+gradle_version=8.5
groovyJUnit_ms=512m
groovyJUnit_mx=2g
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa7..c1962a79e2 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37aef8d3f0..3499ded5c1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d65..aeb74cbb43 100755
--- a/gradlew
+++ b/gradlew
@@ -85,9 +85,6 @@ done
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-# 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"'
-
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -144,7 +141,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=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
@@ -152,7 +149,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=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
done
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