diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index efe950d..f57502a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,13 +16,13 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'corretto' - java-version: '20' + java-version: '21' cache: 'gradle' - name: Setup Gradle uses: gradle/gradle-build-action@v3 with: - gradle-version: 8.6 + gradle-version: 8.7 - name: Test Gradle Build - run: ./gradlew build --dry-run \ No newline at end of file + run: gradle build --dry-run \ No newline at end of file diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml index 5ada73a..8fa66df 100644 --- a/.github/workflows/codestyle.yml +++ b/.github/workflows/codestyle.yml @@ -16,13 +16,13 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'corretto' - java-version: '20' + java-version: '21' cache: 'gradle' - name: Setup Gradle uses: gradle/gradle-build-action@v3 with: - gradle-version: 8.6 + gradle-version: 8.7 - - name: Check codestyle with Gradle Wrapper - run: ./gradlew spotlessCheck \ No newline at end of file + - name: Check code style + run: gradle spotlessCheck \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7d6417f..91558fc 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,19 +20,19 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'corretto' - java-version: '20' + java-version: '21' cache: 'gradle' - name: Setup Gradle uses: gradle/gradle-build-action@v3 with: - gradle-version: 8.6 + gradle-version: 8.7 - name: Create new buildx builder run: docker buildx create --name custom_builder --use - name: Build application - run: ./gradlew build -Dquarkus.package.jar.type=uber-jar + run: gradle build -Dquarkus.package.jar.type=uber-jar - name: Build images run: docker buildx build --platform=linux/amd64 --platform=linux/arm64 -t easybill/peppol-bis-billing-validator:${{github.ref_name}} -t easybill/peppol-bis-billing-validator:latest . --push diff --git a/.github/workflows/spotbugs.yml b/.github/workflows/spotbugs.yml index e70e6a6..ebff3bd 100644 --- a/.github/workflows/spotbugs.yml +++ b/.github/workflows/spotbugs.yml @@ -16,16 +16,16 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'corretto' - java-version: '20' + java-version: '21' cache: 'gradle' - name: Setup Gradle uses: gradle/gradle-build-action@v3 with: - gradle-version: 8.6 + gradle-version: 8.7 - name: Main Spotbugs with Gradle Wrapper - run: ./gradlew spotbugsMain + run: gradle spotbugsMain - name: Test Spotbugs with Gradle Wrapper - run: ./gradlew spotbugsTest \ No newline at end of file + run: gradle spotbugsTest \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a0f4699..2ddc0c6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,4 +1,4 @@ -name: "Tests" + name: "Tests" on: push: @@ -8,14 +8,13 @@ on: jobs: build: - runs-on: ubuntu-latest - strategy: matrix: include: - - { operating-system: 'ubuntu-latest', java-version: '19' } - { operating-system: 'ubuntu-latest', java-version: '21' } + runs-on: ${{ matrix.operating-system }} + steps: - uses: actions/checkout@v4 @@ -29,7 +28,7 @@ jobs: - name: Setup Gradle uses: gradle/gradle-build-action@v3 with: - gradle-version: 8.6 + gradle-version: 8.7 - name: Run tests with gradle wrapper - run: ./gradlew test \ No newline at end of file + run: gradle test \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index b3c58c7..7e95d09 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,3 @@ -import org.gradle.kotlin.dsl.internal.sharedruntime.codegen.sourceNameOfBinaryName - plugins { java id("io.quarkus") @@ -39,8 +37,8 @@ group = "io.github.easybill" version = "" java { - sourceCompatibility = JavaVersion.VERSION_19 - targetCompatibility = JavaVersion.VERSION_19 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } spotbugs { @@ -67,16 +65,8 @@ checkerFramework { suppressLombokWarnings = false checkers = listOf( "org.checkerframework.checker.nullness.NullnessChecker", - "org.checkerframework.checker.units.UnitsChecker", - "org.checkerframework.checker.interning.InterningChecker", - "org.checkerframework.checker.index.IndexChecker", - "org.checkerframework.checker.calledmethods.CalledMethodsChecker", "org.checkerframework.checker.resourceleak.ResourceLeakChecker", - "org.checkerframework.checker.tainting.TaintingChecker", "org.checkerframework.checker.formatter.FormatterChecker", - "org.checkerframework.checker.propkey.PropertyKeyChecker", - "org.checkerframework.framework.util.PurityChecker", - "org.checkerframework.common.value.ValueChecker", ) extraJavacArgs = listOf( "-AsuppressWarnings=type.anno.before.decl.anno,type.anno.before.modifier" @@ -86,6 +76,7 @@ checkerFramework { tasks.withType { systemProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager") } + tasks.withType { options.encoding = "UTF-8" options.compilerArgs.add("-parameters") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05..e69de29 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17655d0..48c0a02 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists