From ce7ce6c8b7152a70571010899654003fef3d0111 Mon Sep 17 00:00:00 2001 From: Clinton Alexander Date: Thu, 24 Aug 2017 15:58:41 +0100 Subject: [PATCH] Used a more robust location for the caplet classes now that gradle 4 has changed the classes directory structure. --- node/capsule/build.gradle | 4 ++-- tools/explorer/capsule/build.gradle | 2 +- webserver/webcapsule/build.gradle | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/node/capsule/build.gradle b/node/capsule/build.gradle index 12de5f404e..ca5d578407 100644 --- a/node/capsule/build.gradle +++ b/node/capsule/build.gradle @@ -26,8 +26,8 @@ task buildCordaJAR(type: FatCapsule, dependsOn: project(':node').compileJava) { applicationSource = files( project(':node').configurations.runtime, project(':node').jar, - '../build/classes/main/CordaCaplet.class', - '../build/classes/main/CordaCaplet$1.class', + project(':node').sourceSets.main.java.outputDir.toString() + '/CordaCaplet.class', + project(':node').sourceSets.main.java.outputDir.toString() + '/CordaCaplet$1.class', "$rootDir/config/dev/log4j2.xml" ) from 'NOTICE' // Copy CDDL notice diff --git a/tools/explorer/capsule/build.gradle b/tools/explorer/capsule/build.gradle index c0a35f7b20..09a4005c6d 100644 --- a/tools/explorer/capsule/build.gradle +++ b/tools/explorer/capsule/build.gradle @@ -31,7 +31,7 @@ task buildExplorerJAR(type: FatCapsule, dependsOn: project(':tools:explorer').co applicationSource = files( project(':tools:explorer').configurations.runtime, project(':tools:explorer').jar, - '../build/classes/main/ExplorerCaplet.class' + project(':tools:explorer').sourceSets.main.java.outputDir.toString() + '/ExplorerCaplet.class' ) classifier 'fat' diff --git a/webserver/webcapsule/build.gradle b/webserver/webcapsule/build.gradle index 9f5fa8df55..53b52324de 100644 --- a/webserver/webcapsule/build.gradle +++ b/webserver/webcapsule/build.gradle @@ -26,8 +26,8 @@ task buildWebserverJar(type: FatCapsule, dependsOn: project(':node').compileJava applicationSource = files( project(':webserver').configurations.runtime, project(':webserver').jar, - new File(project(':node').buildDir, 'classes/main/CordaCaplet.class'), - new File(project(':node').buildDir, 'classes/main/CordaCaplet$1.class'), + project(':node').sourceSets.main.java.outputDir.toString() + '/CordaCaplet.class', + project(':node').sourceSets.main.java.outputDir.toString() + '/CordaCaplet$1.class', "$rootDir/config/dev/log4j2.xml" ) from 'NOTICE' // Copy CDDL notice