From 375392d32d52477b74de75a174fc98abf50116bc Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Wed, 24 May 2017 09:58:33 +0100 Subject: [PATCH] Compile caplets against correct version of capsule. (#732) --- build.gradle | 6 ++++++ node/build.gradle | 3 ++- tools/explorer/build.gradle | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0b9e4e43f3..54bc126c8b 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,11 @@ buildscript { // TODO: Sort this alphabetically. ext.kotlin_version = constants.getProperty("kotlinVersion") ext.quasar_version = '0.7.6' // TODO: Upgrade to 0.7.7+ when Quasar bug 238 is resolved. + + // gradle-capsule-plugin:1.0.2 contains capsule:1.0.1 + // TODO: Upgrade gradle-capsule-plugin to a version with capsule:1.0.3 + ext.capsule_version = '1.0.1' + ext.asm_version = '0.5.3' ext.artemis_version = '1.5.3' ext.jackson_version = '2.8.5' @@ -68,6 +73,7 @@ buildscript { plugins { // TODO The capsule plugin requires the newer DSL plugin block.It would be nice if we could unify all the plugins into one style, // but the DSL has some restrictions e.g can't be used on the allprojects section. So we should revisit this if there are improvements in Gradle. + // Version 1.0.2 of this plugin uses capsule:1.0.1 id "us.kirchmeier.capsule" version "1.0.2" } diff --git a/node/build.gradle b/node/build.gradle index fdecf0ef9a..4dc0c02b44 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -126,7 +126,8 @@ dependencies { compile "org.hibernate:hibernate-java8:$hibernate_version" // Capsule is a library for building independently executable fat JARs. - compile 'co.paralleluniverse:capsule:1.0.3' + // We only need this dependency to compile our Caplet against. + compileOnly "co.paralleluniverse:capsule:$capsule_version" // Java Atomix: RAFT library compile 'io.atomix.copycat:copycat-client:1.2.3' diff --git a/tools/explorer/build.gradle b/tools/explorer/build.gradle index fb89bc99f5..f3609ec2db 100644 --- a/tools/explorer/build.gradle +++ b/tools/explorer/build.gradle @@ -33,6 +33,10 @@ dependencies { compile project(':node') compile project(':finance') + // Capsule is a library for building independently executable fat JARs. + // We only need this dependency to compile our Caplet against. + compileOnly "co.paralleluniverse:capsule:$capsule_version" + // FontAwesomeFX: The "FontAwesome" icon library. compile 'de.jensd:fontawesomefx-fontawesome:4.7.0'