Skip to content

Commit 052a5cc

Browse files
committed
[CALCITE-5440] Bump gradle from 7.4.2 to 7.6.1
1 parent 5ee1b1b commit 052a5cc

File tree

8 files changed

+34
-19
lines changed

8 files changed

+34
-19
lines changed

build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ val javadocAggregate by tasks.registering(Javadoc::class) {
188188

189189
val sourceSets = subprojects
190190
.mapNotNull { it.extensions.findByType<SourceSetContainer>() }
191+
.filter { it.names.contains("main") }
191192
.map { it.named("main") }
192193

193194
classpath = files(sourceSets.map { set -> set.map { it.output + it.compileClasspath } })

buildSrc/build.gradle.kts

-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ fun Project.applyKotlinProjectConventions() {
5353
}
5454

5555
tasks.withType<KotlinCompile> {
56-
sourceCompatibility = "unused"
57-
targetCompatibility = "unused"
5856
kotlinOptions {
5957
jvmTarget = "1.8"
6058
}

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ com.github.vlsi.vlsi-release-plugins.version=1.84
5252
com.google.protobuf.version=0.8.10
5353
de.thetaphi.forbiddenapis.version=3.4
5454
jacoco.version=0.8.8
55-
kotlin.version=1.5.31
55+
kotlin.version=1.7.10
5656
net.ltgt.errorprone.version=1.3.0
5757
me.champeau.gradle.jmh.version=0.5.3
5858
org.jetbrains.gradle.plugin.idea-ext.version=0.5

gradle/wrapper/gradle-wrapper.jar

1.99 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
#
1717
distributionBase=GRADLE_USER_HOME
1818
distributionPath=wrapper/dists
19-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
19+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
20+
networkTimeout=10000
2021
zipStoreBase=GRADLE_USER_HOME
2122
zipStorePath=wrapper/dists
22-
distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
23+
distributionSha256Sum=6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87

gradlew

+14-4
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/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/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/.
@@ -80,10 +80,10 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

8888
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
8989
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
143143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147+
# shellcheck disable=SC3045
146148
MAX_FD=$( ulimit -H -n ) ||
147149
warn "Could not query maximum file descriptor limit"
148150
esac
149151
case $MAX_FD in #(
150152
'' | soft) :;; #(
151153
*)
154+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155+
# shellcheck disable=SC3045
152156
ulimit -n "$MAX_FD" ||
153157
warn "Could not set maximum file descriptor limit to $MAX_FD"
154158
esac
@@ -205,6 +209,12 @@ set -- \
205209
org.gradle.wrapper.GradleWrapperMain \
206210
"$@"
207211

212+
# Stop when "xargs" is not available.
213+
if ! command -v xargs >/dev/null 2>&1
214+
then
215+
die "xargs is not available"
216+
fi
217+
208218
# Use "xargs" to parse quoted args.
209219
#
210220
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

+9-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%" == "" @echo off
17+
@if "%DEBUG%"=="" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
28+
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4041

4142
set JAVA_EXE=java.exe
4243
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
44+
if %ERRORLEVEL% equ 0 goto execute
4445

4546
echo.
4647
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
7576

7677
:end
7778
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
79+
if %ERRORLEVEL% equ 0 goto mainEnd
7980

8081
:fail
8182
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8283
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
84+
set EXIT_CODE=%ERRORLEVEL%
85+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87+
exit /b %EXIT_CODE%
8588

8689
:mainEnd
8790
if "%OS%"=="Windows_NT" endlocal

site/_docs/howto.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,17 @@ provides detailed information about how to upgrade Gradle. Here is a list of ste
103103
Gradle. If necessary it will also upgrade the Gradle Wrapper.
104104
This step also updates `gradle/wrapper/gradle-wrapper.properties`,
105105
including the checksum.
106-
4. Step 3 will have removed the header from
106+
4. Check and update Kotlin version in `gradle.properties` if required.
107+
Check should be done against [Kotlin compatibility matrix](https://docs.gradle.org/current/userguide/compatibility.html#kotlin).
108+
5. Step 3 will have removed the header from
107109
`gradle/wrapper/gradle-wrapper.properties`,
108110
so now run `./gradlew autostyleApply` to add it back.
109-
5. Check the updated Gradle version and checksum in
111+
6. Check the updated Gradle version and checksum in
110112
`gradle/wrapper/gradle-wrapper.properties` against the official
111113
[Gradle release checksums](https://gradle.org/release-checksums/).
112-
6. Try to build the project and run tests; debug any errors using the
114+
7. Try to build the project and run tests; debug any errors using the
113115
[Troubleshooting Guide](https://docs.gradle.org/current/userguide/troubleshooting.html#troubleshooting).
114-
7. Update the Gradle version in this howto.
116+
8. Update the Gradle version in this howto.
115117

116118
## Running tests
117119

0 commit comments

Comments
 (0)