Skip to content

Commit

Permalink
AC-580: Release 2.7.0 (#537)
Browse files Browse the repository at this point in the history
- Remove code coverage for now
- Remove unused code in Travis CI
  • Loading branch information
f4ww4z committed Apr 10, 2019
1 parent 392b3e5 commit 85388e7
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 35 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ before_install:

script:
- ./build.sh
- ./gradlew test

after_success:
- ./gradlew jacocoTestReport

deploy:
provider: releases
Expand Down
4 changes: 0 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ buildscript {
}
}

plugins {
id 'jacoco'
}

allprojects {
repositories {
google()
Expand Down
27 changes: 0 additions & 27 deletions openmrs-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

apply plugin: 'jacoco'

buildscript {

repositories {
Expand All @@ -13,7 +11,6 @@ buildscript {
dependencies {
classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
}
}

Expand Down Expand Up @@ -166,28 +163,4 @@ play {

serviceAccountEmail = System.getenv("PUBLISHER_ACCOUNT_ID")
jsonFile = rootProject.file('google_play.json')
}

tasks.withType(Test) {
jacoco.includeNoLocationClasses = true
}

// Our merge report task. Refer to https://gist.github.com/f4ww4z/81a0a227af78b3137e05957826b84883

task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) {

reports {
xml.enabled = true
html.enabled = true
}

def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']
def debugTree = fileTree(dir: "$project.buildDir/intermediates/classes/debug", excludes: fileFilter)
def mainSrc = "$project.projectDir/src/main/java"

sourceDirectories = files([mainSrc])
classDirectories = files([debugTree])
executionData = fileTree(dir: project.buildDir, includes: [
'jacoco/testDebugUnitTest.exec', 'outputs/code-coverage/connected/*coverage.ec'
])
}

0 comments on commit 85388e7

Please sign in to comment.