Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CALCITE-6141] Add jdk8.checkstyle property, use jdk8.checkstyle in case of java 8 #233

Merged
merged 1 commit into from
Nov 28, 2023
Merged

[CALCITE-6141] Add jdk8.checkstyle property, use jdk8.checkstyle in case of java 8 #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
fetch-depth: 50
- name: 'Test'
run: |
./gradlew --no-parallel --no-daemon tasks build javadoc -Pcheckstyle.version=9.3
./gradlew --no-parallel --no-daemon tasks build javadoc

linux-jdk8-avatica:
name: 'Linux (JDK 8), Avatica main'
Expand All @@ -74,7 +74,7 @@ jobs:
fetch-depth: 50
- name: 'Install Avatica to Maven Local'
run: |
./gradlew publishToMavenLocal -Pcalcite.avatica.version=1.0.0-dev-main -PskipJavadoc -Pcheckstyle.version=9.3
./gradlew publishToMavenLocal -Pcalcite.avatica.version=1.0.0-dev-main -PskipJavadoc
- name: 'Test Calcite'
run: |
git clone --depth 100 https://github.com/apache/calcite.git ../calcite
Expand Down
4 changes: 3 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@ allprojects {
if (!skipCheckstyle) {
apply<CheckstylePlugin>()
dependencies {
checkstyle("com.puppycrawl.tools:checkstyle:${"checkstyle".v}")
val checkstyleVersion = if (JavaVersion.current() == JavaVersion.VERSION_1_8)
"jdk8.checkstyle".v else "checkstyle".v
checkstyle("com.puppycrawl.tools:checkstyle:$checkstyleVersion")
}
checkstyle {
// Current one is ~8.8
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ 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
Expand Down
Loading