This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit fd66f80c769d54107682b5e132768b238667b37b Author: Daniel Sun <[email protected]> AuthorDate: Tue Jan 9 01:17:49 2024 +0800 GROOVY-11138: Bump gradle to 8.5 Co-authored-by: Schalk W. Cronjé <[email protected]> --- build-logic/build.gradle | 12 +++---- .../groovy/org.apache.groovy-asciidoctor.gradle | 40 ++++++++++----------- build.gradle | 7 ++++ gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 62076 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 11 +++--- 7 files changed, 40 insertions(+), 34 deletions(-) diff --git a/build-logic/build.gradle b/build-logic/build.gradle index 52b14f4b0d..bb3b14dce7 100644 --- a/build-logic/build.gradle +++ b/build-logic/build.gradle @@ -27,12 +27,12 @@ repositories { } dependencies { - implementation 'org.asciidoctor:asciidoctor-gradle-jvm:3.3.2' - implementation 'org.asciidoctor:asciidoctor-gradle-jvm-pdf:3.3.2' - implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.31.4' - implementation 'org.nosphere.apache:creadur-rat-gradle:0.8.0' - implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.13' - implementation 'me.champeau.jmh:jmh-gradle-plugin:0.7.1' + implementation 'org.asciidoctor:asciidoctor-gradle-jvm:4.0.0' + implementation 'org.asciidoctor:asciidoctor-gradle-jvm-pdf:4.0.0' + implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:5.1.13' + implementation 'org.nosphere.apache:creadur-rat-gradle:0.8.1' + implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.5' + implementation 'me.champeau.jmh:jmh-gradle-plugin:0.7.2' } tasks.withType(Jar).configureEach { diff --git a/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle index c39ff2c074..7c15f854a4 100644 --- a/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle +++ b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle @@ -39,12 +39,6 @@ configurations { asciidocExtensions } -dependencies { - // TODO: Remove it after AsciidoctorJ 4.0.0 new release, workaround to fix NoClassDefFoundError on Gradle 7.6+, - // see https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/655#issuecomment-1374479836 - asciidocExtensions gradleApi() -} - tasks.withType(AbstractAsciidoctorTask).configureEach { outputs.cacheIf { true } usesService(ConcurrentExecutionControlBuildService.restrict(AbstractAsciidoctorTask, gradle)) @@ -99,22 +93,26 @@ asciidoctorj { resolutionStrategy { it.disableDependencyVerification() } - docExtensions { - def baseUrls = [ - jdk: 'https://docs.oracle.com/en/java/javase/11/docs/api/index.html', - gjdk: "https://docs.groovy-lang.org/${vers}/html/groovy-jdk/index.html";, - gapi: "https://docs.groovy-lang.org/${vers}/html/gapi/index.html";, - gapid: "https://docs.groovy-lang.org/${vers}/html/gapi/";, - ] - baseUrls.each { macroName, baseURL -> - inline_macro(name: macroName) { - parent, target, attributes -> - def (className, anchor) = target.split('#') as List - def base = className == 'index' ? - baseURL : baseURL + '?' + className.replace('.', '/') + '.html' + (anchor ? '#' + anchor : '') - createPhraseNode(parent, 'anchor', attributes.text ?: target, attributes, [type: ':link', target: base]) + def baseUrls = [ + jdk: 'https://docs.oracle.com/en/java/javase/11/docs/api/index.html', + gjdk: "https://docs.groovy-lang.org/${vers}/html/groovy-jdk/index.html";, + gapi: "https://docs.groovy-lang.org/${vers}/html/gapi/index.html";, + gapid: "https://docs.groovy-lang.org/${vers}/html/gapi/";, + ] + for (def entry : baseUrls.entrySet()) { + def macroName = entry.key + def baseUrl = entry.value + docExtensions """ + inline_macro(name: '${macroName}') { parent, target, attributes -> + def classNameAndAnchor = target.split('#') + def className = classNameAndAnchor[0] + def anchor = classNameAndAnchor.length > 1 ? classNameAndAnchor[1] : null + def baseURL = '${baseUrl}' + def base = className == 'index' ? + baseURL : baseURL + '?' + className.replace('.', '/') + '.html' + (anchor ? '#' + anchor : '') + createPhraseNode(parent, 'anchor', attributes.text ?: target, attributes, [type: ':link', target: base]) } - } + """ } modules { diagram.version(versions.asciidoctorDiagram) diff --git a/build.gradle b/build.gradle index e4767b13a2..7d5438f0b6 100644 --- a/build.gradle +++ b/build.gradle @@ -257,3 +257,10 @@ tasks.named("dependencyUpdates")?.configure { !(it.currentVersion.toLowerCase() ==~ UNSTABLE) && it.candidate.version.toLowerCase() ==~ UNSTABLE } } + +artifacts { + grapesRuntimeElements file: jar.archiveFile.get().asFile, type: 'jar' + xstreamAstRuntimeElements file: jar.archiveFile.get().asFile, type: 'jar' + gparsRuntimeElements file: jar.archiveFile.get().asFile, type: 'jar' + loggingRuntimeElements file: jar.archiveFile.get().asFile, type: 'jar' +} diff --git a/gradle.properties b/gradle.properties index 7f497b5574..1848479f07 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ groovyTargetBytecodeVersion=1.8 targetJavaVersion=8 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
