From d6fcf2650faa678a19d7aa0ffb9293927e88cb7d Mon Sep 17 00:00:00 2001 From: Clinton Date: Wed, 26 Jul 2017 14:48:34 +0100 Subject: [PATCH] Root project now specifies dependencies correctly (#1121) * Root project now specifies dependencies correctly with new cordapp system. * Fixed a comment. --- build.gradle | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 4904203fc2..263b20e2fa 100644 --- a/build.gradle +++ b/build.gradle @@ -168,22 +168,23 @@ repositories { } } +// TODO: Corda root project currently produces a dummy cordapp when it shouldn't. // Required for building out the fat JAR. dependencies { - compile project(':node') + corda project(':node') compile "com.google.guava:guava:$guava_version" - // Set to compile to ensure it exists now deploy nodes no longer relies on build - compile project(path: ":node:capsule", configuration: 'runtimeArtifacts') - compile project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') + // Set to corda compile to ensure it exists now deploy nodes no longer relies on build + corda project(path: ":node:capsule", configuration: 'runtimeArtifacts') + corda project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') // For the buildCordappDependenciesJar task - runtime project(':client:jfx') - runtime project(':client:mock') - runtime project(':client:rpc') - runtime project(':core') - runtime project(':finance') - runtime project(':webserver') + cordaRuntime project(':client:jfx') + cordaRuntime project(':client:mock') + cordaRuntime project(':client:rpc') + cordaRuntime project(':core') + cordaRuntime project(':finance') + cordaRuntime project(':webserver') testCompile project(':test-utils') }