Skip to content

Commit

Permalink
Revert "Build for Java 21"
Browse files Browse the repository at this point in the history
This reverts commit 09b5aaa.
  • Loading branch information
marianobarrios committed Nov 1, 2023
1 parent 09b5aaa commit 38a0e63
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java-version: [ 8, 11, 17, 21 ]
java-version: [ 8, 11, 17, 20 ]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
Expand Down
11 changes: 6 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ plugins {
id 'scala'
id 'signing'
id 'maven-publish'
id "com.diffplug.spotless" version "6.22.0"
id "com.github.spotbugs" version "5.2.1"
// pinned version due to Java 8 compatibility
id "com.diffplug.spotless" version "6.11.0"
// pinned version due to https://github.com/spotbugs/spotbugs/issues/2041
id "com.github.spotbugs" version "5.0.13"
}

compileJava {
Expand Down Expand Up @@ -37,8 +39,7 @@ dependencies {

spotless {
java {
// remove when spotless moved to this Palantir version
palantirJavaFormat("2.38.0")
palantirJavaFormat()
}
scala {
scalafmt('3.7.1').configFile('.scalafmt.conf')
Expand All @@ -47,7 +48,7 @@ spotless {

// There are some compatibility issues with spotless older Java versions,
// but we don't need to cross-do style checks anyway
if (JavaVersion.current().ordinal() < JavaVersion.VERSION_21.ordinal()) {
if (JavaVersion.current().ordinal() < JavaVersion.VERSION_17.ordinal()) {
tasks.findByName("spotlessScala").enabled(false)
tasks.findByName("spotlessJava").enabled(false)
}
Expand Down

0 comments on commit 38a0e63

Please sign in to comment.