Skip to content

Commit

Permalink
[CALCITE-6137] Upgrade Gradle from 8.1.1 to 8.4, support jdk21
Browse files Browse the repository at this point in the history
  • Loading branch information
snuyanzin committed Nov 27, 2023
1 parent 2736c27 commit 692ba37
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 14 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,14 @@ jobs:
run: |
./gradlew --no-parallel --no-daemon build javadoc
linux-jdk19:
name: 'Linux (JDK 19)'
linux-jdk21:
name: 'Linux (JDK 21)'
runs-on: ubuntu-latest
steps:
- name: 'Set up JDK 19'
- name: 'Set up JDK 21'
uses: actions/setup-java@v2
with:
java-version: 19
java-version: 21
distribution: 'zulu'
- uses: actions/checkout@v3
with:
Expand All @@ -189,16 +189,16 @@ jobs:
./gradlew --no-parallel --no-daemon build
mac:
name: 'macOS (JDK 19)'
name: 'macOS (JDK 21)'
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 50
- name: 'Set up JDK 19'
- name: 'Set up JDK 21'
uses: actions/setup-java@v2
with:
java-version: 19
java-version: 21
distribution: 'zulu'
- name: 'Test'
run: |
Expand Down
2 changes: 2 additions & 0 deletions bom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ dependencies {
apiv("com.h2database:h2")
apiv("javax.servlet:javax.servlet-api", "servlet")
apiv("junit:junit")
apiv("net.bytebuddy:byte-buddy", "bytebuddy")
apiv("net.bytebuddy:byte-buddy-agent", "bytebuddy")
apiv("net.hydromatic:scott-data-hsqldb")
apiv("org.apache.httpcomponents.client5:httpclient5")
apiv("org.apache.httpcomponents.core5:httpcore5")
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,12 @@ org.owasp.dependencycheck.version=5.2.2
# Tools
checkerframework.version=3.10.0
checkstyle.version=10.3.2
jdk8.checkstyle.version=9.3
spotbugs.version=3.1.11

asm.version=7.1
bouncycastle.version=1.70
bytebuddy.version=1.14.10
dropwizard-metrics.version=4.0.5
# We support Guava versions as old as 14.0.1 (the version used by Hive)
# but prefer more recent versions.
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 6 additions & 5 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -144,15 +141,15 @@ 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
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
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 692ba37

Please sign in to comment.