Skip to content

Commit 4e1cbcc

Browse files
snuyanzinsnuyanzin
committed
[CALCITE-7500] Add support for jdk 24 in CI
1 parent 9efbff8 commit 4e1cbcc

8 files changed

Lines changed: 31 additions & 25 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,14 @@ jobs:
204204
run: |
205205
./gradlew --no-parallel --no-daemon tasks build javadoc
206206
207-
linux-jdk23:
208-
name: 'Linux (JDK 23)'
207+
linux-jdk24:
208+
name: 'Linux (JDK 24)'
209209
runs-on: ubuntu-latest
210210
steps:
211-
- name: 'Set up JDK 23'
211+
- name: 'Set up JDK 24'
212212
uses: actions/setup-java@v4
213213
with:
214-
java-version: 23
214+
java-version: 24
215215
distribution: 'zulu'
216216
- uses: actions/checkout@v4
217217
with:

‎build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ allprojects {
203203
}
204204
if (!skipAutostyle) {
205205
apply(plugin = "com.github.autostyle")
206-
autostyle {
206+
configure<com.github.autostyle.gradle.AutostyleExtension> {
207207
fun com.github.autostyle.gradle.BaseFormatExtension.license() {
208208
licenseHeader(rootProject.ide.licenseHeader)
209209
trimTrailingWhitespace()
@@ -255,8 +255,8 @@ allprojects {
255255
// Ensure builds are reproducible
256256
isPreserveFileTimestamps = false
257257
isReproducibleFileOrder = true
258-
dirMode = "775".toInt(8)
259-
fileMode = "664".toInt(8)
258+
dirPermissions { unix("775") }
259+
filePermissions { unix("664") }
260260
}
261261

262262
tasks.register<DependencyReportTask>("allDependencies") {}
@@ -319,7 +319,7 @@ allprojects {
319319
}
320320

321321
if (!skipAutostyle) {
322-
autostyle {
322+
configure<com.github.autostyle.gradle.AutostyleExtension> {
323323
java {
324324
licenseHeader(rootProject.ide.licenseHeader)
325325
importOrder(
@@ -421,7 +421,7 @@ allprojects {
421421
passProperty("user.country", "tr")
422422
passProperty("user.timezone", "UTC")
423423
val props = System.getProperties()
424-
for (e in props.propertyNames() as `java.util`.Enumeration<String>) {
424+
for (e in props.stringPropertyNames()) {
425425
if (e.startsWith("calcite.") || e.startsWith("avatica.")) {
426426
passProperty(e)
427427
}

‎core/build.gradle.kts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,11 @@ tasks.processResources {
114114
dependsOn(tasks.getByName("extractProto"))
115115
}
116116

117-
tasks.autostyleJavaCheck {
118-
dependsOn(filterJava)
119-
dependsOn(tasks.getByName("generateProto"))
117+
listOf("autostyleJavaCheck", "autostyleJavaProcess").forEach { taskName ->
118+
tasks.matching { it.name == taskName }.configureEach {
119+
dependsOn(filterJava)
120+
dependsOn(tasks.getByName("generateProto"))
121+
}
120122
}
121123

122124
tasks.register<Copy>("copyFuzzDependencies") {

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ calcite.avatica.version=1.28.0
3434
# publishGradleMetadata=true
3535

3636
# Plugins
37-
com.github.autostyle.version=3.0
37+
com.github.autostyle.version=3.2
3838
com.github.johnrengelman.shadow.version=8.1.1
3939
com.github.spotbugs.version=2.0.0
40-
com.github.vlsi.vlsi-release-plugins.version=1.90
40+
com.github.vlsi.vlsi-release-plugins.version=3.0.1
4141
com.google.protobuf.version=0.8.12
4242
de.thetaphi.forbiddenapis.version=3.7
4343
org.jetbrains.gradle.plugin.idea-ext.version=0.5
@@ -55,9 +55,9 @@ jdk8.checkstyle.version=9.3
5555
jdk8.org.owasp.dependencycheck.version=10.0.4
5656
spotbugs.version=3.1.11
5757

58-
asm.version=9.7.1
58+
asm.version=9.9.1
5959
bouncycastle.version=1.70
60-
bytebuddy.version=1.15.1
60+
bytebuddy.version=1.18.8
6161
dropwizard-metrics.version=4.0.5
6262
# We support Guava versions as old as 14.0.1 (the version used by Hive)
6363
# but prefer more recent versions.

‎gradle/wrapper/gradle-wrapper.jar‎

311 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#
1717
distributionBase=GRADLE_USER_HOME
1818
distributionPath=wrapper/dists
19-
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
20-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
19+
distributionSha256Sum=f1771298a70f6db5a29daf62378c4e18a17fc33c9ba6b14362e0cdf40610380d
20+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
2121
networkTimeout=10000
2222
validateDistributionUrl=true
2323
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 7 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)