diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 8be54f7..53468c9 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -34,7 +34,7 @@ jobs: - name: Build and analyze env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: gradle build jacocoTestReport sonar --info + run: gradle build jacocoAggregatedReport sonar --info - name: Login to Docker Hub run: docker login -u a002k -p ${{ secrets.DOCKER_PASSWORD }} - name: Build and tag the Docker image diff --git a/build.gradle b/build.gradle index f0e65b2..d6b3165 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,8 @@ plugins { alias(libs.plugins.spotbugs) alias(libs.plugins.ben.manes.versions) alias(libs.plugins.nebula.lint) + alias(libs.plugins.sonarqube) + alias(libs.plugins.jacocolog) } spotbugs { @@ -27,7 +29,7 @@ ext { allprojects { group = 'com.ak' - version = '2024.06.12' + version = '2024.06.15' apply plugin: 'idea' idea { module { @@ -55,6 +57,16 @@ allprojects { } } + sonar { + properties { + property 'sonar.projectKey', 'ak-git_SimpleApp' + property 'sonar.organization', 'ak-git' + property 'sonar.host.url', 'https://sonarcloud.io' + property 'sonar.branch.name', 'master' + property 'sonar.coverage.jacoco.xmlReportPaths', 'build/reports/jacoco/jacocoAggregatedReport/jacocoAggregatedReport.xml' + } + } + dependencies { implementation libs.findbugs.jsr305 testImplementation(platform(libs.junit)) diff --git a/hello/build.gradle b/hello/build.gradle index 19903c5..55f4332 100644 --- a/hello/build.gradle +++ b/hello/build.gradle @@ -1,16 +1,5 @@ plugins { id 'application' - alias(libs.plugins.sonarqube) -} - -sonar { - properties { - property 'sonar.projectKey', 'ak-git_SimpleApp' - property 'sonar.organization', 'ak-git' - property 'sonar.host.url', 'https://sonarcloud.io' - property 'sonar.branch.name', 'master' - property 'sonar.coverage.jacoco.xmlReportPaths', 'build/reports/jacoco/test/jacocoTestReport.xml' - } } dependencies { diff --git a/hello/src/main/java/com/ak/app/MainApp.java b/hello/src/main/java/com/ak/app/MainApp.java index 802901d..c619b88 100644 --- a/hello/src/main/java/com/ak/app/MainApp.java +++ b/hello/src/main/java/com/ak/app/MainApp.java @@ -9,6 +9,6 @@ private MainApp() { } public static void main(String[] args) { - Logger.getLogger(MainApp.class.getName()).info(() -> BaseUtils.calc("Hello word 2024.06.12!")); + Logger.getLogger(MainApp.class.getName()).info(() -> BaseUtils.calc("Hello word 2024.06.15!")); } } diff --git a/libs.versions.toml b/libs.versions.toml index 752930f..ffac678 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -1,7 +1,8 @@ [versions] javamodularity-moduleplugin = '1.8.15' sonarqube = '5.0.0.4638' -spotbugs = '6.0.16' +jacocolog = '3.1.0' +spotbugs = '6.0.17' ben-manes-versions = '0.51.0' nebula-lint = '19.0.2' @@ -12,6 +13,7 @@ assertj = '3.26.0' [plugins] javamodularity-moduleplugin = { id = 'org.javamodularity.moduleplugin', version.ref = 'javamodularity-moduleplugin' } sonarqube = { id = 'org.sonarqube', version.ref = 'sonarqube' } +jacocolog = { id = 'org.barfuin.gradle.jacocolog', version.ref = 'jacocolog' } spotbugs = { id = 'com.github.spotbugs', version.ref = 'spotbugs' } ben-manes-versions = { id = 'com.github.ben-manes.versions', version.ref = 'ben-manes-versions' } nebula-lint = { id = 'nebula.lint', version.ref = 'nebula-lint' }