From 36ffdf6f6cb1fb8eb0ef344748a2aca7c61435fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20M=C3=B6ller?= <jakob.moeller@sap.com>
Date: Mon, 8 Jun 2020 09:19:58 +0200
Subject: [PATCH] Fix/appbuild release minified instantiates jacoco (#266)
* Remove Jacoco Plugin for Coverage Upload
Signed-off-by: d067928 <jakob.moeller@sap.com>
* Separate Jacoco Task
* Revert "Separate Jacoco Task"
This reverts commit a1f6a67f8319f7f4874e51d6222628ac498c276a.
* Removing Jacoco Circle Ci Step
* Removing testCoverageEnabled Parameter
Co-authored-by: Hee Tatt Ooi <hee.tatt.ooi@sap.com>
Co-authored-by: Thomas Kowark <thomas.kowark@sap.com>
---
.circleci/config.yml | 6 ------
Corona-Warn-App/build.gradle | 1 -
build.gradle | 6 ------
3 files changed, 13 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ed0062ff5..5f3a483cb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,12 +24,6 @@ jobs:
environment:
JVM_OPTS: -Xmx2048m
GRADLE_OPTS: -Xmx1536m -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.caching=true -Dorg.gradle.configureondemand=true -Dkotlin.compiler.execution.strategy=in-process -Dkotlin.incremental=false
- - run:
- name: JaCoCo report
- command: ./gradlew :Corona-Warn-App:jacocoTestReportDeviceRelease
- environment:
- JVM_OPTS: -Xmx2048m
- GRADLE_OPTS: -Xmx1536m -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.caching=true -Dorg.gradle.configureondemand=true -Dkotlin.compiler.execution.strategy=in-process -Dkotlin.incremental=false
- scan-sonar
- save-build-cache
- save_cache:
diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle
index a48d11066..06076f1a8 100644
--- a/Corona-Warn-App/build.gradle
+++ b/Corona-Warn-App/build.gradle
@@ -82,7 +82,6 @@ android {
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- testCoverageEnabled true
buildConfigField "String", "EXPORT_SIGNATURE_ID", "\"de.rki.coronawarnapp-dev\""
}
}
diff --git a/build.gradle b/build.gradle
index 6c9620328..7c9cabba6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,6 @@ buildscript {
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion"
classpath "org.jlleitschuh.gradle:ktlint-gradle:9.2.1"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.9.1"
- classpath "com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -29,7 +28,6 @@ buildscript {
subprojects {
apply plugin: "io.gitlab.arturbosch.detekt"
apply plugin: "org.jlleitschuh.gradle.ktlint"
- apply plugin: "com.vanniktech.android.junit.jacoco"
detekt {
debug = true
@@ -51,10 +49,6 @@ subprojects {
ignoreFailures = false
coloredOutput = false
}
-
- junitJacoco {
- jacocoVersion = '0.8.5'
- }
}
allprojects {
--
GitLab