Skip to content

Commit 0abf70d

Browse files
authored
Merge pull request #501 from nimblehq/chore/470-update-kover-to-0.7.0
[#470] Migrate to Kover 0.7.0
2 parents 89649db + f8fe485 commit 0abf70d

33 files changed

+250
-284
lines changed

.cicdtemplate/.bitrise/bitrise.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ workflows:
4949
# Execute UnitTest
5050
- android-unit-test@1:
5151
inputs:
52-
- arguments: koverMergedHtmlReport
52+
- arguments: koverHtmlReport
5353
- variant: "$VARIANT"
5454
- module: "$MODULE"
5555
- report_path_pattern: '*build/reports'
@@ -61,7 +61,7 @@ workflows:
6161
# Upload Kover report to Apps & Artifacts for later downloading
6262
- deploy-to-bitrise-io@1:
6363
inputs:
64-
- deploy_path: "$PROJECT_LOCATION/build/reports/kover/merged/html/index.html"
64+
- deploy_path: "$PROJECT_LOCATION/app/build/reports/kover/html/index.html"
6565
- is_enable_public_page: 'false'
6666
- is_compress: 'true'
6767
- notify_user_groups: none

.cicdtemplate/.codemagic/codemagic.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ definitions:
1515
script: ./gradlew detekt
1616
- &unit_test
1717
name: Run unit tests
18-
script: ./gradlew koverMergedReport
18+
script: ./gradlew koverHtmlReport
1919
artifacts:
20-
- &artifacts_test_report build/reports/kover/merged/
20+
- &artifacts_test_report app/build/reports/kover/
2121
- &artifacts_staging_apk app/build/outputs/apk/staging/debug/app-staging-debug.apk
2222
- &artifacts_production_apk app/build/outputs/apk/production/debug/app-production-debug.apk
2323
workflows:

.cicdtemplate/.github/workflows/deploy_staging_and_production_to_firebase_app_distribution.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ jobs:
4848
path: build/reports/detekt/
4949

5050
- name: Run unit tests with Kover
51-
run: ./gradlew koverMergedHtmlReport
51+
run: ./gradlew koverHtmlReport
5252

5353
- name: Archive code coverage reports
5454
uses: actions/upload-artifact@v2
5555
with:
5656
name: CodeCoverageReports
57-
path: build/reports/kover/merged/
57+
path: app/build/reports/kover/
5858

5959
- name: Build staging APK
6060
run: ./gradlew assembleStagingDebug

.cicdtemplate/.github/workflows/review_pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: ./gradlew lint
3838

3939
- name: Run unit tests with Kover
40-
run: ./gradlew koverMergedXmlReport
40+
run: ./gradlew koverXmlReport
4141

4242
- name: Set up Ruby
4343
uses: ruby/setup-ruby@v1

.cicdtemplate/.github/workflows/run_detekt_and_unit_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ jobs:
5151
path: build/reports/detekt/
5252

5353
- name: Run unit tests with Kover
54-
run: ./gradlew koverMergedHtmlReport
54+
run: ./gradlew koverHtmlReport
5555

5656
- name: Archive code coverage reports
5757
uses: actions/upload-artifact@v2
5858
if: always()
5959
with:
6060
name: CodeCoverageReports
61-
path: build/reports/kover/merged/
61+
path: app/build/reports/kover/

.github/workflows/review_pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
- name: Run unit tests with Kover on template-xml
4545
working-directory: ./template-xml
46-
run: ./gradlew koverMergedXmlReport
46+
run: ./gradlew koverXmlReport
4747

4848
# template-compose
4949

@@ -57,7 +57,7 @@ jobs:
5757

5858
- name: Run unit tests with Kover on template-compose
5959
working-directory: ./template-compose
60-
run: ./gradlew koverMergedXmlReport
60+
run: ./gradlew koverXmlReport
6161

6262
- name: Set up Ruby
6363
uses: ruby/setup-ruby@v1

.github/workflows/run_detekt_and_unit_tests.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ jobs:
4242

4343
- name: Run unit tests with Kover on template-xml
4444
working-directory: ./template-xml
45-
run: ./gradlew koverMergedHtmlReport
45+
run: ./gradlew koverHtmlReport
4646

4747
- name: Archive code coverage reports on template-xml
4848
uses: actions/upload-artifact@v2
4949
with:
5050
name: CodeCoverageReportsTemplateXML
51-
path: template-xml/build/reports/kover/merged/
51+
path: template-xml/app/build/reports/kover/
5252

5353
# template-compose
5454

@@ -64,13 +64,13 @@ jobs:
6464

6565
- name: Run unit tests with Kover on template-compose
6666
working-directory: ./template-compose
67-
run: ./gradlew koverMergedHtmlReport
67+
run: ./gradlew koverHtmlReport
6868

6969
- name: Archive code coverage reports on template-compose
7070
uses: actions/upload-artifact@v2
7171
with:
7272
name: CodeCoverageReportsTemplateCompose
73-
path: template-compose/build/reports/kover/merged/
73+
path: template-compose/app/build/reports/kover/
7474

7575
# sample-xml
7676

@@ -86,13 +86,13 @@ jobs:
8686

8787
- name: Run unit tests with Kover on sample-xml
8888
working-directory: ./sample-xml
89-
run: ./gradlew koverMergedHtmlReport
89+
run: ./gradlew koverHtmlReport
9090

9191
- name: Archive code coverage reports on sample-xml
9292
uses: actions/upload-artifact@v2
9393
with:
9494
name: CodeCoverageReportsTemplateXML
95-
path: sample-xml/build/reports/kover/merged/
95+
path: sample-xml/app/build/reports/kover/
9696

9797
# sample-compose
9898

@@ -108,10 +108,10 @@ jobs:
108108

109109
- name: Run unit tests with Kover on sample-compose
110110
working-directory: ./sample-compose
111-
run: ./gradlew koverMergedHtmlReport
111+
run: ./gradlew koverHtmlReport
112112

113113
- name: Archive code coverage reports on sample-compose
114114
uses: actions/upload-artifact@v2
115115
with:
116116
name: CodeCoverageReportsTemplateCompose
117-
path: sample-compose/build/reports/kover/merged/
117+
path: sample-compose/app/build/reports/kover/

Dangerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ end
3131

3232
# Show Danger test coverage report from Kover for templates
3333
# Report coverage of modified files, warn if total project coverage is under 80%
34-
# or if any modified file's coverage is under 90%
35-
kover_file_template_xml = "template-xml/build/reports/kover/merged/xml/report.xml"
34+
# or if any modified file's coverage is under 95%
35+
kover_file_template_xml = "template-xml/app/build/reports/kover/report.xml"
3636
markdown "## Kover report for template-xml:"
3737
shroud.reportKover "Template - XML Unit Tests", kover_file_template_xml, 80, 95, false
3838

39-
kover_file_template_compose = "template-compose/build/reports/kover/merged/xml/report.xml"
39+
kover_file_template_compose = "template-compose/app/build/reports/kover/report.xml"
4040
markdown "## Kover report for template-compose:"
4141
shroud.reportKover "Template - Compose Unit Tests", kover_file_template_compose, 80, 95, false

codemagic.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ definitions:
2121
- &unit_test_on_template_compose
2222
name: Run unit tests on template-compose
2323
working_directory: ./template-compose
24-
script: ./gradlew koverMergedReport
24+
script: ./gradlew koverHtmlReport
2525
- &unit_test_on_template_xml
2626
name: Run unit tests on template-xml
2727
working_directory: ./template-xml
28-
script: ./gradlew koverMergedReport
28+
script: ./gradlew koverHtmlReport
2929
artifacts:
30-
- &artifacts_template_compose template-compose/build/reports/kover/merged/
31-
- &artifacts_template_xml template-xml/build/reports/kover/merged/
30+
- &artifacts_template_compose template-compose/app/build/reports/kover/
31+
- &artifacts_template_xml template-xml/app/build/reports/kover/
3232
- &artifacts_staging_apk template-compose/app/build/outputs/apk/staging/debug/app-staging-debug.apk
3333
- &artifacts_production_apk template-compose/app/build/outputs/apk/production/debug/app-production-debug.apk
3434
workflows:

sample-compose/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ $ ./gradlew domain:test
3838
- Run unit testing with coverage:
3939

4040
```
41-
$ ./gradlew koverMergedHtmlReport
41+
$ ./gradlew koverHtmlReport
4242
```
4343

44-
Report is located at: `./build/reports/kover/merged/`
44+
Report is located at: `app/build/reports/kover/`
4545

4646
## Build and deploy
4747

0 commit comments

Comments
 (0)