This is an automated email from the ASF dual-hosted git repository. toulmean pushed a commit to branch 1.0 in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 169b4b77f06e3e96f6802b7cd7baa79393020122 Author: Antoine Toulme <[email protected]> AuthorDate: Tue Apr 23 23:24:07 2019 -0700 Make distribution a subproject and all elements to it --- build.gradle | 19 ------------------- dist/build.gradle | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ settings.gradle | 1 + 3 files changed, 49 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index b4aee72..bae3c9a 100644 --- a/build.gradle +++ b/build.gradle @@ -121,7 +121,6 @@ subprojects { task allDependencies(type: DependencyReportTask) {} } - ////// // Project defaults @@ -266,24 +265,6 @@ allprojects { } } - distZip { - into(project.name) { - from '.' - include 'DISCLAIMER' - include 'LICENSE' - include 'NOTICE' - } - } - - distTar { - into(project.name) { - from '.' - include 'DISCLAIMER' - include 'LICENSE' - include 'NOTICE' - } - } - if (project.name != 'eth-reference-tests') { artifacts { diff --git a/dist/build.gradle b/dist/build.gradle new file mode 100644 index 0000000..4ca1377 --- /dev/null +++ b/dist/build.gradle @@ -0,0 +1,48 @@ +description = 'Tuweni distribution.' + +apply plugin: 'distribution' + +distributions { + main { + baseName = 'tuweni' + contents { + into('') { + from ".." + include 'README.md' + include 'DISCLAIMER' + include 'LICENSE' + include 'NOTICE' + } + def docs = [] + def libs = [] + def sources = [] + rootProject.subprojects.each { s -> + if (s.name != 'eth-reference-tests') { + docs << s.dokkaJar.outputs + libs << s.jar.outputs + sources << s.sourcesJar.outputs + } + } + into('lib') { + from rootProject.jar + from libs + } + into('sources') { + from rootProject.sourcesJar + from sources + } + into('docs') { + from rootProject.dokkaJar + from docs + } + into('site') { + from rootProject.dokka.outputDirectory + from rootProject.javadoc.outputDirectory + } + } + } +} + +distTar{ + compression = Compression.GZIP +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index f6e1850..f0e1d0c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,7 @@ include 'concurrent-coroutines' include 'config' include 'crypto' include 'devp2p' +include 'dist' include 'eth' include 'eth-reference-tests' include 'eth-repository' --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
