Used a more robust location for the caplet classes now that gradle 4 has changed the classes directory structure.

This commit is contained in:
Clinton Alexander 2017-08-24 15:58:41 +01:00
parent f7d06e8218
commit ce7ce6c8b7
3 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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'

View File

@ -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