Skip to content

Commit

Permalink
Add jacocoAggregatedReport
Browse files Browse the repository at this point in the history
  • Loading branch information
ak-git committed Jun 15, 2024
1 parent 6653bef commit f22cdcf
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 13 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -27,7 +29,7 @@ ext {

allprojects {
group = 'com.ak'
version = '2024.06.12'
version = '2024.06.15'
apply plugin: 'idea'
idea {
module {
Expand Down Expand Up @@ -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))
Expand Down
11 changes: 0 additions & 11 deletions hello/build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion hello/src/main/java/com/ak/app/MainApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -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!"));
}
}
4 changes: 3 additions & 1 deletion libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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'

Expand All @@ -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' }
Expand Down

0 comments on commit f22cdcf

Please sign in to comment.