From 08d52d42b640d0d53a57193bdfeb23db26e4fe11 Mon Sep 17 00:00:00 2001 From: ffasitella Date: Tue, 2 Nov 2021 15:50:06 -0300 Subject: [PATCH 1/2] Modified code coverage report --- app/build.gradle | 13 +++++++++---- jacoco.gradle | 11 ++++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 45ff6ea..9238582 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,10 +38,10 @@ android { keyPassword 'android' } release { - storeFile release_keystore - storePassword store_password - keyAlias key_alias - keyPassword key_password + storeFile file('keystore/debug.keystore') + storePassword 'android' + keyAlias 'androiddebugkey' + keyPassword 'android' } } @@ -114,6 +114,11 @@ buildscript { ext.mockito_kotlin_version = "2.2.0" } +tasks.withType(Test) { + jacoco.includeNoLocationClasses = true + jacoco.excludes = ['jdk.internal.*'] +} + dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') diff --git a/jacoco.gradle b/jacoco.gradle index 3359e96..a1e0dab 100644 --- a/jacoco.gradle +++ b/jacoco.gradle @@ -4,7 +4,16 @@ jacoco { toolVersion = "0.7.5.201505241946" } -project.afterEvaluate { +testOptions { + unitTests.all { + jacoco { + includeNoLocationClasses = true + } + } + unitTests.returnDefaultValues = true +} + +jacocoTestReport { // Grab all build types and product flavors def buildTypes = android.buildTypes.collect { type -> type.name } def productFlavors = android.productFlavors.collect { flavor -> flavor.name } From c50a210ddade0a7d6d3d432fc1c4c262e0c9b142 Mon Sep 17 00:00:00 2001 From: ffasitella Date: Tue, 2 Nov 2021 15:58:53 -0300 Subject: [PATCH 2/2] Rollbacked release signing config --- app/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9238582..a578f9d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,10 +38,10 @@ android { keyPassword 'android' } release { - storeFile file('keystore/debug.keystore') - storePassword 'android' - keyAlias 'androiddebugkey' - keyPassword 'android' + storeFile release_keystore + storePassword store_password + keyAlias key_alias + keyPassword key_password } }