From ffcaa551bdc41dab55370c67e674bb6e11bee548 Mon Sep 17 00:00:00 2001 From: Ximena Perez Date: Thu, 2 Feb 2023 12:40:12 -0300 Subject: [PATCH 1/7] Update yml file --- .github/workflows/gradle.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4a1944c..4858305 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -28,4 +28,10 @@ jobs: uses: gradle/gradle-build-action@v2 - name: Gradle check task - Build and Test FlowForms-Core run: ./gradlew FlowForms-Core:check + - name: Test & publish code coverage + uses: paambaati/codeclimate-action@v3.2.0 + env: + CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} + with: + coverageLocations: FlowForms-Core/build/reports/kover/report.xml:xml From 82ebc56712a2bc875860fd06a8830650a082f47c Mon Sep 17 00:00:00 2001 From: Ximena Perez Date: Fri, 3 Feb 2023 10:59:28 -0300 Subject: [PATCH 2/7] Change format --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4858305..3ab2d63 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -33,5 +33,5 @@ jobs: env: CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} with: - coverageLocations: FlowForms-Core/build/reports/kover/report.xml:xml + coverageLocations: FlowForms-Core/build/reports/kover/report.xml:jacoco From f16cf01ce9bb989b73c74889386cd5d52276b33d Mon Sep 17 00:00:00 2001 From: Ximena Perez Date: Thu, 9 Feb 2023 11:30:40 -0300 Subject: [PATCH 3/7] Change route --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 3ab2d63..81aa8c7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -33,5 +33,5 @@ jobs: env: CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} with: - coverageLocations: FlowForms-Core/build/reports/kover/report.xml:jacoco + coverageLocations: home/runner/work/FlowForms/FlowForms/FlowForms-Core/build/reports/kover/report.xml:jacoco From 8faa7c68ccb2c18edc63c8aae11148f9e5daade2 Mon Sep 17 00:00:00 2001 From: Ximena Perez Date: Thu, 9 Feb 2023 12:04:02 -0300 Subject: [PATCH 4/7] Add jacoco --- FlowForms-Core/build.gradle.kts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/FlowForms-Core/build.gradle.kts b/FlowForms-Core/build.gradle.kts index 24e323b..80787cc 100644 --- a/FlowForms-Core/build.gradle.kts +++ b/FlowForms-Core/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("multiplatform") - id("org.jetbrains.kotlinx.kover") version "0.5.1" + id("org.jetbrains.kotlinx.kover") version "0.6.1" id("com.android.library") `maven-publish` } @@ -43,12 +43,8 @@ kotlin { val rootPkg = "com.rootstrap.flowforms" -tasks.koverMergedHtmlReport { - excludes = listOf( - "${rootPkg}.core.common.StatusCodes", - "${rootPkg}.util.*", - "${rootPkg}.core.BuildConfig" - ) +kover { + engine.set(kotlinx.kover.api.DefaultJacocoEngine) } android { From 9af53a6f11d5950cc47faf8578056758c4475eef Mon Sep 17 00:00:00 2001 From: Ximena Perez Date: Thu, 9 Feb 2023 12:18:33 -0300 Subject: [PATCH 5/7] Add koverMerged --- FlowForms-Core/build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/FlowForms-Core/build.gradle.kts b/FlowForms-Core/build.gradle.kts index 80787cc..c6ee146 100644 --- a/FlowForms-Core/build.gradle.kts +++ b/FlowForms-Core/build.gradle.kts @@ -44,9 +44,14 @@ kotlin { val rootPkg = "com.rootstrap.flowforms" kover { + isDisabled.set(false) engine.set(kotlinx.kover.api.DefaultJacocoEngine) } +koverMerged { + enable() +} + android { compileSdk = 32 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") From d83baf24c215e2e8c305bce3b92b43aa7b501385 Mon Sep 17 00:00:00 2001 From: Ximena Perez Date: Thu, 9 Feb 2023 12:34:39 -0300 Subject: [PATCH 6/7] Add set xml report --- FlowForms-Core/build.gradle.kts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/FlowForms-Core/build.gradle.kts b/FlowForms-Core/build.gradle.kts index c6ee146..87328fc 100644 --- a/FlowForms-Core/build.gradle.kts +++ b/FlowForms-Core/build.gradle.kts @@ -50,6 +50,15 @@ kover { koverMerged { enable() + + xmlReport { + onCheck.set(false) + reportFile.set(layout.buildDirectory.file("$buildDir/reports/kover/result.xml")) + } + htmlReport { + onCheck.set(false) + reportDir.set(layout.buildDirectory.dir("$buildDir/reports/kover/html-result")) + } } android { From 646a8f08a6716532b1f62b3fd888f04334a62dbc Mon Sep 17 00:00:00 2001 From: Ximena Perez Date: Thu, 9 Feb 2023 12:43:29 -0300 Subject: [PATCH 7/7] Remove on check false --- FlowForms-Core/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FlowForms-Core/build.gradle.kts b/FlowForms-Core/build.gradle.kts index 87328fc..1f9e6ea 100644 --- a/FlowForms-Core/build.gradle.kts +++ b/FlowForms-Core/build.gradle.kts @@ -52,11 +52,11 @@ koverMerged { enable() xmlReport { - onCheck.set(false) + //onCheck.set(false) reportFile.set(layout.buildDirectory.file("$buildDir/reports/kover/result.xml")) } htmlReport { - onCheck.set(false) + // onCheck.set(false) reportDir.set(layout.buildDirectory.dir("$buildDir/reports/kover/html-result")) } }