build: build tools versions declaration in ./dependencies.gradle
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/57abd7dc Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/57abd7dc Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/57abd7dc Branch: refs/heads/develop Commit: 57abd7dcf36244e42a0114a30adaf35be15bf772 Parents: 8a123ad Author: Paul Merlin <[email protected]> Authored: Mon Nov 21 02:42:06 2016 +0100 Committer: Paul Merlin <[email protected]> Committed: Mon Nov 21 02:42:06 2016 +0100 ---------------------------------------------------------------------- .../groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy | 4 +++- .../main/groovy/org/apache/zest/gradle/RootProjectPlugin.groovy | 4 +++- .../gradle/dependencies/DependenciesDeclarationExtension.groovy | 1 + dependencies.gradle | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/57abd7dc/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 8fb411a..0541684 100644 --- a/buildSrc/src/main/groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy @@ -18,6 +18,7 @@ package org.apache.zest.gradle 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 @@ -99,9 +100,10 @@ class CodeProjectsPlugin implements Plugin<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 = '0.7.5.201505241946' + 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/57abd7dc/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 8b92186..8c058d1 100644 --- a/buildSrc/src/main/groovy/org/apache/zest/gradle/RootProjectPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/zest/gradle/RootProjectPlugin.groovy @@ -19,6 +19,7 @@ package org.apache.zest.gradle import groovy.transform.CompileStatic import org.apache.rat.gradle.RatTask +import org.apache.zest.gradle.dependencies.DependenciesDeclarationExtension import org.apache.zest.gradle.dist.DistributionPlugin import org.apache.zest.gradle.release.ReleaseSpecExtension import org.apache.zest.gradle.release.ReleaseSpecPlugin @@ -105,8 +106,9 @@ class RootProjectPlugin implements Plugin<Project> private static void configureJacoco( Project project ) { + def dependencies = project.rootProject.extensions.getByType( DependenciesDeclarationExtension ) project.configurations.create( 'jacoco' ) - project.dependencies.add( 'jacoco', 'org.jacoco:org.jacoco.ant:0.7.5.201505241946' ) + project.dependencies.add( 'jacoco', "org.jacoco:org.jacoco.ant:${ dependencies.buildToolsVersions.jacoco }" ) def task = project.tasks.create( 'coverageReport', AggregatedJacocoReportTask ) { AggregatedJacocoReportTask task -> task.group = TaskGroups.VERIFICATION task.description = 'Generates global coverage report' http://git-wip-us.apache.org/repos/asf/zest-java/blob/57abd7dc/buildSrc/src/main/groovy/org/apache/zest/gradle/dependencies/DependenciesDeclarationExtension.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/zest/gradle/dependencies/DependenciesDeclarationExtension.groovy b/buildSrc/src/main/groovy/org/apache/zest/gradle/dependencies/DependenciesDeclarationExtension.groovy index fbeb2f0..8a5570c 100644 --- a/buildSrc/src/main/groovy/org/apache/zest/gradle/dependencies/DependenciesDeclarationExtension.groovy +++ b/buildSrc/src/main/groovy/org/apache/zest/gradle/dependencies/DependenciesDeclarationExtension.groovy @@ -29,4 +29,5 @@ class DependenciesDeclarationExtension final Map<String, Object> libraries = [ : ] final Map<String, List<Object>> defaultDependencies = [ : ] BiAction<DependencySubstitution, ModuleComponentSelector> dependencySubstitutionSpec + final Map<String, String> buildToolsVersions = [ : ] } http://git-wip-us.apache.org/repos/asf/zest-java/blob/57abd7dc/dependencies.gradle ---------------------------------------------------------------------- diff --git a/dependencies.gradle b/dependencies.gradle index f75022e..b3c0aa3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -250,3 +250,8 @@ dependencies.dependencySubstitutionSpec = { DependencySubstitution substitution, substitution.useTarget group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1' } } + +// Build Tools +dependencies.buildToolsVersions << [ + jacoco: '0.7.7.201606060606' +]
