Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,14 @@ jobs:
run: |
./gradlew --no-parallel --no-daemon tasks build javadoc

linux-jdk23:
name: 'Linux (JDK 23)'
linux-jdk24:
name: 'Linux (JDK 24)'
runs-on: ubuntu-latest
steps:
- name: 'Set up JDK 23'
- name: 'Set up JDK 24'
uses: actions/setup-java@v4
with:
java-version: 23
java-version: 24
distribution: 'zulu'
- uses: actions/checkout@v4
with:
Expand Down
10 changes: 5 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ allprojects {
}
if (!skipAutostyle) {
apply(plugin = "com.github.autostyle")
autostyle {
configure<com.github.autostyle.gradle.AutostyleExtension> {
fun com.github.autostyle.gradle.BaseFormatExtension.license() {
licenseHeader(rootProject.ide.licenseHeader)
trimTrailingWhitespace()
Expand Down Expand Up @@ -255,8 +255,8 @@ allprojects {
// Ensure builds are reproducible
isPreserveFileTimestamps = false
isReproducibleFileOrder = true
dirMode = "775".toInt(8)
fileMode = "664".toInt(8)
dirPermissions { unix("775") }
filePermissions { unix("664") }
}

tasks.register<DependencyReportTask>("allDependencies") {}
Expand Down Expand Up @@ -319,7 +319,7 @@ allprojects {
}

if (!skipAutostyle) {
autostyle {
configure<com.github.autostyle.gradle.AutostyleExtension> {
java {
licenseHeader(rootProject.ide.licenseHeader)
importOrder(
Expand Down Expand Up @@ -421,7 +421,7 @@ allprojects {
passProperty("user.country", "tr")
passProperty("user.timezone", "UTC")
val props = System.getProperties()
for (e in props.propertyNames() as `java.util`.Enumeration<String>) {
for (e in props.stringPropertyNames()) {
if (e.startsWith("calcite.") || e.startsWith("avatica.")) {
passProperty(e)
}
Expand Down
8 changes: 5 additions & 3 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,11 @@ tasks.processResources {
dependsOn(tasks.getByName("extractProto"))
}

tasks.autostyleJavaCheck {
dependsOn(filterJava)
dependsOn(tasks.getByName("generateProto"))
listOf("autostyleJavaCheck", "autostyleJavaProcess").forEach { taskName ->
tasks.matching { it.name == taskName }.configureEach {
dependsOn(filterJava)
dependsOn(tasks.getByName("generateProto"))
}
}

tasks.register<Copy>("copyFuzzDependencies") {
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ calcite.avatica.version=1.28.0
# publishGradleMetadata=true

# Plugins
com.github.autostyle.version=3.0
com.github.autostyle.version=3.2
com.github.johnrengelman.shadow.version=8.1.1
com.github.spotbugs.version=2.0.0
com.github.vlsi.vlsi-release-plugins.version=1.90
com.github.vlsi.vlsi-release-plugins.version=3.0.1
com.google.protobuf.version=0.8.12
de.thetaphi.forbiddenapis.version=3.7
org.jetbrains.gradle.plugin.idea-ext.version=0.5
Expand All @@ -55,9 +55,9 @@ jdk8.checkstyle.version=9.3
jdk8.org.owasp.dependencycheck.version=10.0.4
spotbugs.version=3.1.11

asm.version=9.7.1
asm.version=9.9.1
bouncycastle.version=1.70
bytebuddy.version=1.15.1
bytebuddy.version=1.18.8
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=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionSha256Sum=f1771298a70f6db5a29daf62378c4e18a17fc33c9ba6b14362e0cdf40610380d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
12 changes: 7 additions & 5 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading