This is an automated email from the ASF dual-hosted git repository. snuyanzin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/main by this push: new 052a5cc724 [CALCITE-5440] Bump gradle from 7.4.2 to 7.6.1 052a5cc724 is described below commit 052a5cc724a889edf19c1d76ea166c0d0924a5d3 Author: Sergey Nuyanzin <snuyan...@gmail.com> AuthorDate: Tue Nov 29 09:42:55 2022 +0100 [CALCITE-5440] Bump gradle from 7.4.2 to 7.6.1 --- build.gradle.kts | 1 + buildSrc/build.gradle.kts | 2 -- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 61574 bytes gradle/wrapper/gradle-wrapper.properties | 5 +++-- gradlew | 18 ++++++++++++++---- gradlew.bat | 15 +++++++++------ site/_docs/howto.md | 10 ++++++---- 8 files changed, 34 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8e27adba2d..b4bb44ca02 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -188,6 +188,7 @@ val javadocAggregate by tasks.registering(Javadoc::class) { val sourceSets = subprojects .mapNotNull { it.extensions.findByType<SourceSetContainer>() } + .filter { it.names.contains("main") } .map { it.named("main") } classpath = files(sourceSets.map { set -> set.map { it.output + it.compileClasspath } }) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 4546221433..06f486a9fc 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -53,8 +53,6 @@ fun Project.applyKotlinProjectConventions() { } tasks.withType<KotlinCompile> { - sourceCompatibility = "unused" - targetCompatibility = "unused" kotlinOptions { jvmTarget = "1.8" } diff --git a/gradle.properties b/gradle.properties index 66ca35ba68..08f73d27a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -52,7 +52,7 @@ com.github.vlsi.vlsi-release-plugins.version=1.84 com.google.protobuf.version=0.8.10 de.thetaphi.forbiddenapis.version=3.4 jacoco.version=0.8.8 -kotlin.version=1.5.31 +kotlin.version=1.7.10 net.ltgt.errorprone.version=1.3.0 me.champeau.gradle.jmh.version=0.5.3 org.jetbrains.gradle.plugin.idea-ext.version=0.5 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2a..943f0cbfa7 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 09fdba8d64..49b350a3a5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -16,7 +16,8 @@ # distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda +distributionSha256Sum=6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87 diff --git a/gradlew b/gradlew index 1b6c787337..65dcd68d65 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/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 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"' @@ -143,12 +143,16 @@ fi 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 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -205,6 +209,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/site/_docs/howto.md b/site/_docs/howto.md index 64a52cf6fd..ca08b19932 100644 --- a/site/_docs/howto.md +++ b/site/_docs/howto.md @@ -103,15 +103,17 @@ provides detailed information about how to upgrade Gradle. Here is a list of ste Gradle. If necessary it will also upgrade the Gradle Wrapper. This step also updates `gradle/wrapper/gradle-wrapper.properties`, including the checksum. -4. Step 3 will have removed the header from +4. Check and update Kotlin version in `gradle.properties` if required. + Check should be done against [Kotlin compatibility matrix](https://docs.gradle.org/current/userguide/compatibility.html#kotlin). +5. Step 3 will have removed the header from `gradle/wrapper/gradle-wrapper.properties`, so now run `./gradlew autostyleApply` to add it back. -5. Check the updated Gradle version and checksum in +6. Check the updated Gradle version and checksum in `gradle/wrapper/gradle-wrapper.properties` against the official [Gradle release checksums](https://gradle.org/release-checksums/). -6. Try to build the project and run tests; debug any errors using the +7. Try to build the project and run tests; debug any errors using the [Troubleshooting Guide](https://docs.gradle.org/current/userguide/troubleshooting.html#troubleshooting). -7. Update the Gradle version in this howto. +8. Update the Gradle version in this howto. ## Running tests