Repository: zest-java Updated Branches: refs/heads/develop 75b2ce847 -> c6317c08f
build: update Jacoco to 0.7.8 and enable it for JDK 9 builds Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/c6317c08 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/c6317c08 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/c6317c08 Branch: refs/heads/develop Commit: c6317c08f476d2a6885c5ffe884abfa668e5602e Parents: 75b2ce8 Author: Paul Merlin <[email protected]> Authored: Mon Dec 12 22:34:59 2016 +0100 Committer: Paul Merlin <[email protected]> Committed: Mon Dec 12 22:34:59 2016 +0100 ---------------------------------------------------------------------- .../apache/zest/gradle/CodeProjectsPlugin.groovy | 19 +++++++------------ .../apache/zest/gradle/RootProjectPlugin.groovy | 3 --- dependencies.gradle | 2 +- 3 files changed, 8 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/c6317c08/buildSrc/src/main/groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy b/buildSrc/src/main/groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy index 0541684..69fc0c4 100644 --- a/buildSrc/src/main/groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy @@ -21,7 +21,6 @@ import groovy.transform.CompileStatic import org.apache.zest.gradle.dependencies.DependenciesDeclarationExtension import org.apache.zest.gradle.doc.AsciidocBuildInfoPlugin import org.apache.zest.gradle.version.VersionClassPlugin -import org.gradle.api.JavaVersion import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.plugins.JavaPluginConvention @@ -97,17 +96,13 @@ class CodeProjectsPlugin implements Plugin<Project> private static void configureJacoco( Project project ) { - // ZEST-175 - if( JavaVersion.current() < JavaVersion.VERSION_1_9 ) - { - def dependencies = project.rootProject.extensions.getByType( DependenciesDeclarationExtension ) - project.plugins.apply 'jacoco' - def jacoco = project.extensions.getByType( JacocoPluginExtension ) - jacoco.toolVersion = dependencies.buildToolsVersions.jacoco - project.tasks.withType( JacocoReport ) { JacocoReport task -> - task.group = TaskGroups.VERIFICATION - task.description = 'Generates test coverage report.' - } + def dependencies = project.rootProject.extensions.getByType( DependenciesDeclarationExtension ) + project.plugins.apply 'jacoco' + def jacoco = project.extensions.getByType( JacocoPluginExtension ) + jacoco.toolVersion = dependencies.buildToolsVersions.jacoco + project.tasks.withType( JacocoReport ) { JacocoReport task -> + task.group = TaskGroups.VERIFICATION + task.description = 'Generates test coverage report.' } } http://git-wip-us.apache.org/repos/asf/zest-java/blob/c6317c08/buildSrc/src/main/groovy/org/apache/zest/gradle/RootProjectPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/zest/gradle/RootProjectPlugin.groovy b/buildSrc/src/main/groovy/org/apache/zest/gradle/RootProjectPlugin.groovy index e669c99..66d0fcc 100644 --- a/buildSrc/src/main/groovy/org/apache/zest/gradle/RootProjectPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/zest/gradle/RootProjectPlugin.groovy @@ -25,7 +25,6 @@ import org.apache.zest.gradle.release.ReleaseSpecExtension import org.apache.zest.gradle.release.ReleaseSpecPlugin import org.apache.zest.gradle.test.AggregatedJacocoReportTask import org.gradle.api.GradleException -import org.gradle.api.JavaVersion import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.Task @@ -112,8 +111,6 @@ class RootProjectPlugin implements Plugin<Project> def task = project.tasks.create( 'coverageReport', AggregatedJacocoReportTask ) { AggregatedJacocoReportTask task -> task.group = TaskGroups.VERIFICATION task.description = 'Generates global coverage report' - // ZEST-175 - task.enabled = JavaVersion.current() < JavaVersion.VERSION_1_9 task.dependsOn project.subprojects.collect( { Project p -> p.tasks.getByName( 'test' ) } ) } project.tasks.getByName( 'check' ).dependsOn task http://git-wip-us.apache.org/repos/asf/zest-java/blob/c6317c08/dependencies.gradle ---------------------------------------------------------------------- diff --git a/dependencies.gradle b/dependencies.gradle index a56c160..26157f8 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -255,5 +255,5 @@ dependencies.dependencySubstitutionSpec = { DependencySubstitution substitution, // Build Tools dependencies.buildToolsVersions << [ - jacoco: '0.7.7.201606060606' + jacoco: '0.7.8' ]
