Skip to content

Commit

Permalink
Test using Java 21
Browse files Browse the repository at this point in the history
  • Loading branch information
marianobarrios committed May 11, 2024
1 parent f6fedd1 commit 6bb38d3
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java-version: [ 8, 11, 17, 18 ]
java-version: [ 8, 11, 17, 21 ]
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

Expand All @@ -19,3 +19,5 @@ jobs:
if: ${{ matrix.java-version == 8 }}

- run: ./gradlew assemble check --info
env:
JAVA_TOOLCHAIN: ${{ matrix.java-version }}
27 changes: 22 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,31 @@ plugins {
id 'java'
id 'signing'
id 'maven-publish'
id "com.diffplug.spotless" version "6.13.0"
id "com.diffplug.spotless" version "6.25.0"
}

compileJava {
if (JavaVersion.current().ordinal() > JavaVersion.VERSION_1_8.ordinal()) {
options.compilerArgs.addAll(['--release', '8'])
var javaToolchain = System.getenv('JAVA_TOOLCHAIN')

java {
if (javaToolchain != null) {
toolchain {
languageVersion = JavaLanguageVersion.of(javaToolchain)
}
}
}

compileJava {
sourceCompatibility = '8'
targetCompatibility = '8'
options.compilerArgs.add('-Xlint')
}

compileTestJava {
sourceCompatibility = '8'
targetCompatibility = '8'
options.compilerArgs.add('-Xlint')
}

repositories {
mavenLocal()
mavenCentral()
Expand All @@ -22,7 +38,8 @@ dependencies {

spotless {
java {
palantirJavaFormat()
// remove when spotless moved to this Palantir version
palantirJavaFormat("2.38.0")
}
}

Expand Down

0 comments on commit 6bb38d3

Please sign in to comment.