Skip to content

Commit b7a7472

Browse files
vRallevvanniktech
authored andcommitted
Support Android Gradle Plugin 3.2.x (#122)
1 parent c7e1817 commit b7a7472

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/main/groovy/com/vanniktech/android/junit/jacoco/GenerationPlugin.groovy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,11 @@ class GenerationPlugin implements Plugin<Project> {
159159
}
160160
}
161161

162-
def classPaths = ["**/intermediates/classes/${sourcePath}/**"]
162+
def classPaths = [
163+
"**/intermediates/classes/${sourcePath}/**",
164+
"**/intermediates/javac/${sourceName}/*/classes/**" // Android Gradle Plugin 3.2.x support.
165+
]
166+
163167
if (isKotlinAndroid(subProject)) {
164168
classPaths << "**/tmp/kotlin-classes/${sourcePath}/**"
165169
if (productFlavorName) {

src/test/groovy/com/vanniktech/android/junit/jacoco/GenerationTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public class GenerationTest {
224224
assert reports.html.destination.toString() == project.buildDir.absolutePath + "/reports/jacoco/${flavor}${buildType.capitalize()}"
225225

226226
assert classDirectories.dir == project.file("build/")
227-
assert contentEquals(classDirectories.includes, ["**/intermediates/classes/${flavor}/${buildType}/**".toString()])
227+
assert contentEquals(classDirectories.includes, ["**/intermediates/classes/${flavor}/${buildType}/**".toString(), "**/intermediates/javac/${flavor}${buildType.capitalize()}/*/classes/**".toString()])
228228

229229
assert taskDependsOn(task, "test${flavor.capitalize()}${buildType.capitalize()}UnitTest")
230230
assert taskDependsOn(project.tasks.findByName('check'), "jacocoTestReport${flavor.capitalize()}${buildType.capitalize()}")
@@ -266,7 +266,7 @@ public class GenerationTest {
266266
assert reports.html.destination.toString() == project.buildDir.absolutePath + '/reports/jacoco/debug'
267267

268268
assert classDirectories.dir == project.file("build/")
269-
assert contentEquals(classDirectories.includes, ['**/intermediates/classes/debug/**'])
269+
assert contentEquals(classDirectories.includes, ['**/intermediates/classes/debug/**', '**/intermediates/javac/debug/*/classes/**'])
270270

271271
assert taskDependsOn(debugTask, 'testDebugUnitTest')
272272
assert taskDependsOn(project.tasks.findByName('check'), 'jacocoTestReportDebug')
@@ -302,7 +302,7 @@ public class GenerationTest {
302302
assert reports.html.destination.toString() == project.buildDir.absolutePath + '/reports/jacoco/release'
303303

304304
assert classDirectories.dir == project.file("build/")
305-
assert contentEquals(classDirectories.includes, ['**/intermediates/classes/release/**'])
305+
assert contentEquals(classDirectories.includes, ['**/intermediates/classes/release/**', '**/intermediates/javac/release/*/classes/**'])
306306

307307
assert taskDependsOn(releaseTask, 'testReleaseUnitTest')
308308
assert taskDependsOn(project.tasks.findByName('check'), 'jacocoTestReportRelease')

0 commit comments

Comments
 (0)