include code coverage of testkit tests

Author: dcendents

build.gradle

@@ -15,29 +15,28 @@ repositories {
 	mavenLocal()
 }
 
-sourceSets {
-	test {
-		groovy {
-			srcDirs = ['src/test/groovy', 'src/test/core/src/testFixtures/groovy', 'src/test/internal-testing/src/main/groovy' ]
-		}
-	}
-}
-
 ext {
 	gradleVersions = '3.0'
 	androidGradleBuildVersion = '2.2.0-beta1'
 	androidCompileSdkVersion = 'android-24'
 	androidBuildToolsVersion = '24.0.0'
 }
 
-test {
-	systemProperty 'gradle.versions', gradleVersions
-	systemProperty 'android.gradle.build.version', androidGradleBuildVersion
-	systemProperty 'android.compile.sdk.version', androidCompileSdkVersion
-	systemProperty 'android.build.tools.version', androidBuildToolsVersion
+configurations {
+	jacocoRuntime
+}
+
+sourceSets {
+	test {
+		groovy {
+			srcDirs = ['src/test/groovy', 'src/test/core/src/testFixtures/groovy', 'src/test/internal-testing/src/main/groovy' ]
+		}
+	}
 }
 
 dependencies {
+	jacocoRuntime "org.jacoco:org.jacoco.agent:${jacoco.toolVersion}:runtime"
+	
 	compile gradleApi()
 
 	// from gradle/gradle/dependencies.gradle
@@ -112,6 +111,15 @@ dependencies {
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
+test {
+	systemProperty 'gradle.versions', gradleVersions
+	systemProperty 'android.gradle.build.version', androidGradleBuildVersion
+	systemProperty 'android.compile.sdk.version', androidCompileSdkVersion
+	systemProperty 'android.build.tools.version', androidBuildToolsVersion
+	systemProperty 'jacoco.runtime', configurations.jacocoRuntime.asPath.replace('\\', '/')
+	systemProperty 'buildDir', "$buildDir".replace('\\', '/')
+}
+
 plugindev {
 	pluginId = 'com.github.dcendents.android-maven'
 	pluginImplementationClass 'org.gradle.api.plugins.AndroidMavenPlugin'
@@ -179,6 +187,10 @@ jacoco {
 }
 
 jacocoTestReport {
+	def coverageFiles = fileTree("${buildDir}/jacoco").include('*.exec')
+	coverageFiles.each { file ->
+      executionData file
+	} 
 	reports {
 		xml.enabled true
 		html.enabled true

src/gradleTest/simple/build.gradle

@@ -14,11 +14,14 @@ class AndroidMavenPluginIT extends Specification {
 	@Shared def androidGradleBuildVersion = "${System.properties['android.gradle.build.version']}"
 	@Shared def androidCompileSdkVersion = "${System.properties['android.compile.sdk.version']}"
 	@Shared def androidBuildToolsVersion = "${System.properties['android.build.tools.version']}"
+	@Shared def jacocoRuntime = "${System.properties['jacoco.runtime']}"
+	@Shared def buildDir = "${System.properties['buildDir']}"
 
     @Rule final TemporaryFolder testProjectDir = new TemporaryFolder()
 
 	File androidManifest
 	File settingsFile
+	File gradlePropertiesFile
     File buildFile
 
     def setup() {
@@ -27,6 +30,7 @@ class AndroidMavenPluginIT extends Specification {
 		mainFolder.mkdirs()
 		androidManifest = new File(mainFolder, 'AndroidManifest.xml')
         settingsFile = testProjectDir.newFile('settings.gradle')
+		gradlePropertiesFile = testProjectDir.newFile('gradle.properties')
         buildFile = testProjectDir.newFile('build.gradle')
     }
 
@@ -41,6 +45,8 @@ class AndroidMavenPluginIT extends Specification {
 
 		settingsFile << "rootProject.name = 'simple'"
 
+		gradlePropertiesFile << "org.gradle.jvmargs=-javaagent:${jacocoRuntime}=destfile=${buildDir}/jacoco/testKit-${gradleVersion}.exec"
+		
 		def uri = testProjectDir.root.toURI()
         buildFile << """
 			buildscript {