Funkwhale/ultrasonic-app-subsonic-android
1
0
Fork 0
mirror of https://github.com/ultrasonic/ultrasonic synced 2025-02-11 09:10:57 +01:00
Code Issues Releases Wiki Activity

Fix slightly wrong jacoco setup.

Browse Source
This commit is contained in:
Yahor Berdnikau 2018-10-07 21:21:49 +02:00
parent 3371b4025d
commit 2e008c7ed6
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gradle_scripts/android-module-bootstrap.gradle
View File

@ -1,7 +1,7 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply plugin: 'jacoco-android' apply plugin: 'jacoco'
apply from: "${project.rootDir}/gradle_scripts/code_quality.gradle" apply from: "${project.rootDir}/gradle_scripts/code_quality.gradle"
androidExtensions { androidExtensions {
@ -51,6 +51,10 @@ targetCompatibility = JavaVersion.VERSION_1_8
tasks.withType(Test) { tasks.withType(Test) {
useJUnitPlatform() useJUnitPlatform()
jacoco {
includeNoLocationClasses = true
excludes += jacocoExclude
}
} }
dependencies { dependencies {
@ -68,10 +72,3 @@ ext {
jacocoExclude = [] jacocoExclude = []
} }
jacocoAndroidUnitTestReport {
excludes += jacocoExclude
}
afterEvaluate {
testDebugUnitTest.finalizedBy jacocoTestDebugUnitTestReport
}

10
gradle_scripts/jacoco.gradle
View File

@ -51,20 +51,20 @@ tasks.create(name: 'jacocoFullReport', type: JacocoReport, dependsOn: 'jacocoMer
subproject.plugins.withId("jacoco") { subproject.plugins.withId("jacoco") {
project.logger.info("${subproject.name} has Jacoco plugin applied") project.logger.info("${subproject.name} has Jacoco plugin applied")
subproject.plugins.withId("kotlin-android") { subproject.plugins.withId("kotlin-android") {
project.logger.warn("${subproject.name} is android project") project.logger.info("${subproject.name} is android project")
def mainSources = subproject.extensions.findByName("android").sourceSets['main'] def mainSources = subproject.extensions.findByName("android").sourceSets['main']
project.logger.warn("Android sources: ${mainSources.java.srcDirs}") project.logger.info("Android sources: ${mainSources.java.srcDirs}")
mainSources.java.srcDirs.forEach { mainSources.java.srcDirs.forEach {
additionalSourceDirs(it) additionalSourceDirs(it)
} }
project.logger.warn("Subproject exclude: ${subproject.jacocoExclude}") project.logger.info("Subproject exclude: ${subproject.jacocoExclude}")
additionalClassDirs(fileTree( additionalClassDirs(fileTree(
dir: "${subproject.buildDir}/tmp/kotlin-classes/debug", dir: "${subproject.buildDir}/tmp/kotlin-classes/debug",
excludes: subproject.jacocoExclude excludes: subproject.jacocoExclude
)) ))
} }
subproject.plugins.withId("kotlin") { plugin -> subproject.plugins.withId("kotlin") { plugin ->
project.logger.warn("${subproject.name} is common kotlin project") project.logger.info("${subproject.name} is common kotlin project")
SourceDirectorySet mainSources = subproject.extensions.getByName("kotlin") SourceDirectorySet mainSources = subproject.extensions.getByName("kotlin")
.sourceSets[SourceSet.MAIN_SOURCE_SET_NAME] .sourceSets[SourceSet.MAIN_SOURCE_SET_NAME]
.kotlin .kotlin
@ -72,7 +72,7 @@ tasks.create(name: 'jacocoFullReport', type: JacocoReport, dependsOn: 'jacocoMer
project.logger.debug("Adding sources: $it") project.logger.debug("Adding sources: $it")
additionalSourceDirs(it) additionalSourceDirs(it)
} }
project.logger.warn("Subproject exclude: ${subproject.jacocoExclude}") project.logger.info("Subproject exclude: ${subproject.jacocoExclude}")
additionalClassDirs(fileTree( additionalClassDirs(fileTree(
dir: "${subproject.buildDir}/classes/kotlin/main", dir: "${subproject.buildDir}/classes/kotlin/main",
excludes: subproject.jacocoExclude excludes: subproject.jacocoExclude