support for Kotlin #39
Conversation
|
Could this be re-run/manually evaluated as it seems like the CI failed because of an unrelated connection issue. |
| @@ -45,6 +45,10 @@ class JacocoAndroidPlugin implements Plugin<ProjectInternal> { | |||
| plugin | |||
| } | |||
|
|
|||
| private static boolean hasKotlin(PluginContainer plugins) { | |||
There was a problem hiding this comment.
Is that method really necessary for one call?
There was a problem hiding this comment.
It's really not. I was just trying to match the style of these (also only used once) but I have no problem in-lining it.
| @@ -100,7 +113,6 @@ class JacocoAndroidPlugin implements Plugin<ProjectInternal> { | |||
| private void logTaskAdded(JacocoReport reportTask) { | |||
| logger.info("Added $reportTask") | |||
| logger.info(" executionData: $reportTask.executionData.asPath") | |||
| logger.info(" classDirectories: $reportTask.classDirectories.dir.path") | |||
There was a problem hiding this comment.
Because we combine 2 file trees we can no longer reference the class directory path, as it ends up instead listing all the files in the tree, instead of the directory. I wouldn't be surprised if there's a better way to handle this, but I couldn't find one.
| project.fileTree(dir: classesDir, excludes: project.jacocoAndroidUnitTestReport.excludes) | ||
| if (kotlin) { |
There was a problem hiding this comment.
This if-else statement might cause some problems in mixed Java/Kotlin projects. Don't you think?
There was a problem hiding this comment.
Would it? It uses both java and kotlin trees. Unless the same classes up in both places?
There was a problem hiding this comment.
Our project is mixed and I haven't noticed any issues
|
I checked out the pull request branch, build it and applied it to my Kotlin app and my coverage is still reporting 0%. I would expect (after reading the code) that this pull request would fix that for me. But it doesn't. |
|
@peterfortuin If you have zero coverage, it sounds like a configuration problem. We still have some problems with running within Android Studio but running the gradle task works with the correct coverage. This is our configuration, if it is helpful: apply plugin: 'jacoco-android'
android {
testOptions.unitTests.all {
jacoco { includeNoLocationClasses = true }
}
}
jacoco {
toolVersion = "0.8.2"
}
jacocoAndroidUnitTestReport {
csv.enabled false
html.enabled true
xml.enabled true
excludes += ['jdk.internal.*']
} |
Based on the discussion on #37 I made some minor changes to support Kotlin coverage.
I think it might need a little work and maybe a test, but I haven't worked on a Gradle plugin before so I'm not really sure how to write a test for it.
Also, it breaks the logging of
classDirectoriesbecause it needs to use two file trees. There may be a way around this but I couldn't figure it out short of printing every file.