Skip to content

Commit

Permalink
Dev (#3)
Browse files Browse the repository at this point in the history
* Use gradle 8.7
* Optimize workflows
* Use Java 21
  • Loading branch information
BolZer authored Jun 11, 2024
1 parent da19c1b commit 6b990ff
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 33 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
run: gradle build --dry-run
8 changes: 4 additions & 4 deletions .github/workflows/codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- name: Check code style
run: gradle spotlessCheck
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions .github/workflows/spotbugs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
run: gradle spotbugsTest
11 changes: 5 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Tests"
name: "Tests"

on:
push:
Expand All @@ -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

Expand All @@ -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
run: gradle test
15 changes: 3 additions & 12 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import org.gradle.kotlin.dsl.internal.sharedruntime.codegen.sourceNameOfBinaryName

plugins {
java
id("io.quarkus")
Expand Down Expand Up @@ -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 {
Expand All @@ -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"
Expand All @@ -86,6 +76,7 @@ checkerFramework {
tasks.withType<Test> {
systemProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager")
}

tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
options.compilerArgs.add("-parameters")
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 6b990ff

Please sign in to comment.