build: do not publish intermediary projects
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/90bc41c6 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/90bc41c6 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/90bc41c6 Branch: refs/heads/develop Commit: 90bc41c630604e3f0d11fefe990e4163dd273d9b Parents: a504947 Author: Paul Merlin <[email protected]> Authored: Sun Dec 18 01:43:42 2016 +0100 Committer: Paul Merlin <[email protected]> Committed: Sun Dec 18 01:43:42 2016 +0100 ---------------------------------------------------------------------- .../polygene/gradle/AllProjectsPlugin.groovy | 20 ++++++++++++------- .../polygene/gradle/RootProjectPlugin.groovy | 21 +++++++++++++++----- 2 files changed, 29 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/90bc41c6/buildSrc/src/main/groovy/org/apache/polygene/gradle/AllProjectsPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/AllProjectsPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/AllProjectsPlugin.groovy index 07e3582..f890e46 100644 --- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/AllProjectsPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/AllProjectsPlugin.groovy @@ -50,17 +50,23 @@ class AllProjectsPlugin implements Plugin<Project> applyDefaultVersion( project ) applyPolygeneExtension( project ) - configureJava( project ) - project.plugins.apply DependenciesPlugin - configureJavadoc( project ) - configureTest( project ) + if( project.rootProject == project || CodeProjectsPlugin.isCodeProject( project ) ) + { + configureJava( project ) + project.plugins.apply DependenciesPlugin + configureJavadoc( project ) + configureTest( project ) + } if( CodeProjectsPlugin.isCodeProject( project ) ) { project.plugins.apply CodeProjectsPlugin } - configureDependencyReport( project ) - configureHonker( project ) - project.plugins.apply PublishingPlugin + if( project.rootProject == project || CodeProjectsPlugin.isCodeProject( project ) ) + { + configureDependencyReport( project ) + configureHonker( project ) + project.plugins.apply PublishingPlugin + } } private static void applyDefaultVersion( Project project ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/90bc41c6/buildSrc/src/main/groovy/org/apache/polygene/gradle/RootProjectPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/RootProjectPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/RootProjectPlugin.groovy index 12f2601..a0de513 100644 --- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/RootProjectPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/RootProjectPlugin.groovy @@ -93,8 +93,12 @@ class RootProjectPlugin implements Plugin<Project> buildAll.group = TaskGroups.BUILD buildAll.description = 'Builds all' buildAll.dependsOn 'javadocs', 'check', 'jar', - project.subprojects.collect { p -> p.tasks.getByName( 'dependencyReport' ) }, - project.subprojects.collect { p -> p.tasks.getByName( 'assemble' ) }, + project.subprojects + .findAll { p -> CodeProjectsPlugin.isCodeProject( p ) } + .collect { p -> p.tasks.getByName( 'dependencyReport' ) }, + project.subprojects + .findAll { p -> CodeProjectsPlugin.isCodeProject( p ) } + .collect { p -> p.tasks.getByName( 'assemble' ) }, ':manual:website' } @@ -111,7 +115,9 @@ class RootProjectPlugin implements Plugin<Project> def task = project.tasks.create( 'coverageReport', AggregatedJacocoReportTask ) { AggregatedJacocoReportTask task -> task.group = TaskGroups.VERIFICATION task.description = 'Generates global coverage report' - task.dependsOn project.subprojects.collect( { Project p -> p.tasks.getByName( 'test' ) } ) + task.dependsOn project.subprojects + .findAll { p -> CodeProjectsPlugin.isCodeProject( p ) } + .collect( { Project p -> p.tasks.getByName( 'test' ) } ) } project.tasks.getByName( 'check' ).dependsOn task } @@ -122,7 +128,9 @@ class RootProjectPlugin implements Plugin<Project> task.group = TaskGroups.VERIFICATION task.description = 'Generates global test report' task.destinationDir = project.file( "$project.buildDir/reports/tests" ) - task.reportOn project.subprojects.collect { it.tasks.getByName( 'test' ) } + task.reportOn project.subprojects + .findAll { p -> CodeProjectsPlugin.isCodeProject( p ) } + .collect { it.tasks.getByName( 'test' ) } } def test = project.tasks.getByName( 'test' ) as Test test.dependsOn project.subprojects.collect { it.tasks.getByName( 'test' ) } @@ -256,7 +264,10 @@ class RootProjectPlugin implements Plugin<Project> 'rat', 'archiveJavadocs', ':org.apache.polygene.manual:copyWebsite', - project.allprojects.collect { it.tasks.getByName( 'uploadArchives' ) }, + project.allprojects + .findAll { p -> CodeProjectsPlugin.isCodeProject( p ) } + .collect { it.tasks.getByName( 'uploadArchives' ) }, + 'uploadArchives', 'dist' } }
