From 9058ce743d553bcd007d13aa69d7e9c87eeb75c4 Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Mon, 15 Oct 2018 10:03:44 -0600 Subject: [PATCH] [MINOR] Distribution tweaks (#60) * [minor] distribution tweaks * the 'pantheon:client' project is empty, and results in an empty jar, delete * clique hard codes a version, delete so the parent takes effect * clique does not describe it's jar, add description * evmtools does not describe it's jar, add description. results in * clique-1.0.0-SNAPSHOT -> pantheon-clique-0.8.0-RC * evmtools-0.8.0-SNAPSHOT -> pantheon-evmtools-0.8.0-RC * client-0.8.0-SNAPSHOT -> *deleted* * spotless formatting on the gradle file --- acceptance-tests/build.gradle | 1 - consensus/clique/build.gradle | 11 +++++++---- ethereum/evmtool/build.gradle | 8 ++++++++ pantheon/build.gradle | 1 - settings.gradle | 1 - 5 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 ethereum/evmtool/build.gradle diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle index 97c7c04888..79a1388dd8 100644 --- a/acceptance-tests/build.gradle +++ b/acceptance-tests/build.gradle @@ -4,7 +4,6 @@ dependencies { testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl' testImplementation project(':crypto') - testImplementation project(':ethereum:client') testImplementation project(':ethereum:eth') testImplementation project(':ethereum:core') testImplementation project(':ethereum:jsonrpc') diff --git a/consensus/clique/build.gradle b/consensus/clique/build.gradle index 9d6f380bb4..af9119304d 100644 --- a/consensus/clique/build.gradle +++ b/consensus/clique/build.gradle @@ -1,9 +1,12 @@ plugins { id 'java' } -version '1.0.0-SNAPSHOT' - -sourceCompatibility = 1.8 - +jar { + baseName 'pantheon-clique' + manifest { + attributes('Implementation-Title': baseName, + 'Implementation-Version': project.version) + } +} repositories { mavenCentral() } diff --git a/ethereum/evmtool/build.gradle b/ethereum/evmtool/build.gradle new file mode 100644 index 0000000000..99bdadb20c --- /dev/null +++ b/ethereum/evmtool/build.gradle @@ -0,0 +1,8 @@ +jar { + baseName 'pantheon-evmtool' + manifest { + attributes( + 'Implementation-Title': baseName, + 'Implementation-Version': project.version) + } +} diff --git a/pantheon/build.gradle b/pantheon/build.gradle index 35bd1418e1..660316839a 100644 --- a/pantheon/build.gradle +++ b/pantheon/build.gradle @@ -15,7 +15,6 @@ dependencies { implementation project(':consensus:ibft') implementation project(':consensus:clique') implementation project(':ethereum:eth') - implementation project(':ethereum:client') implementation project(':ethereum:core') implementation project(':ethereum:rlp') implementation project(':ethereum:p2p') diff --git a/settings.gradle b/settings.gradle index 05a82a5a37..cbedd14481 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,7 +12,6 @@ include 'ethereum:jsonrpc' include 'ethereum:referencetests' include 'ethereum:core' include 'ethereum:rlp' -include 'ethereum:client' include 'ethereum:eth' include 'ethereum:trie' include 'pantheon'