Fixed coveralls (include all modules). *11

d4rken · Mar 18, 2018 · 8c5736f · 8c5736f
1 parent 9d16fe5
commit 8c5736f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -87,25 +87,19 @@ allprojects {
 
 subprojects { subProject ->
     def exclude = ['eu/darken/R*.class', '**/BuildConfig.class', '**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*']
-    apply plugin: 'jacoco'
     task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) {
         reports {
             xml.enabled = true
             html.enabled = true
         }
 
-        def debugTree = fileTree(dir: "$project.buildDir/intermediates/classes/debug", excludes: exclude)
-        def mainSrc = "${project.projectDir}/src/main/java"
-
-        sourceDirectories = files([mainSrc])
-        classDirectories = files([debugTree])
+        sourceDirectories = files(["${project.projectDir}/src/main/java"])
+        classDirectories = files([fileTree(dir: "$project.buildDir/intermediates/classes/debug", excludes: exclude)])
         executionData = fileTree(dir: "$project.buildDir", includes: [
-                "jacoco/testDebugUnitTest.exec",
-                "outputs/code-coverage/connected/*coverage.ec"
+                "jacoco/testDebugUnitTest.exec"
         ])
 
         rootProject.coveralls.sourceDirs.addAll(sourceDirectories.flatten())
-        println "println2" + rootProject.coveralls.sourceDirs
     }
 
     afterEvaluate {
@@ -142,10 +136,9 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
         html.enabled = true
         xml.enabled = true
     }
-
 }
+
 coveralls {
-    println "coveralls-sourcedir-final" + sourceDirs
     jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml"
 }
 

diff --git a/core/build.gradle b/core/build.gradle
@@ -21,11 +21,6 @@ android {
         textOutput 'stdout'
         disable 'TimberTagLength'
     }
-    buildTypes {
-        release {}
-        debug {
-        }
-    }
 }
 afterEvaluate {
     javadoc.classpath += files(android.libraryVariants.collect { variant ->

diff --git a/example/build.gradle b/example/build.gradle
@@ -22,8 +22,6 @@ android {
     }
 
     buildTypes {
-        debug {
-        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

diff --git a/root/build.gradle b/root/build.gradle
@@ -21,11 +21,6 @@ android {
         textOutput 'stdout'
         disable 'TimberTagLength'
     }
-    buildTypes {
-        release {}
-        debug {
-        }
-    }
 }
 
 dependencies {