From 3ab56fa2239a851c477c46e4fd5a2a93c9e1de33 Mon Sep 17 00:00:00 2001 From: Clinton Alexander Date: Fri, 4 Nov 2016 17:53:37 +0000 Subject: [PATCH] Added back gradle config needed by quasar and capsule. --- build.gradle | 8 +++++++- buildSrc/src/main/groovy/QuasarPlugin.groovy | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index aaafea1715..fc737f327d 100644 --- a/build.gradle +++ b/build.gradle @@ -54,10 +54,14 @@ allprojects { repositories { mavenCentral() jcenter() + maven { + url 'https://dl.bintray.com/kotlin/exposed' + } } +// Required for building out the fat JAR. dependencies { - // Required for Quasar. TODO: Remove this dependency. + compile project(':node') compile "com.google.guava:guava:19.0" } @@ -146,6 +150,8 @@ task installTemplateNodes(dependsOn: 'buildCordaJAR') << { // TODO: Verify this works for gradle plugins. task(install, dependsOn: 'publishToMavenLocal') +quasarScan.dependsOn('classes', ':node:classes', ':core:classes', ':finance:classes') + publishing { publications { corda(MavenPublication) { diff --git a/buildSrc/src/main/groovy/QuasarPlugin.groovy b/buildSrc/src/main/groovy/QuasarPlugin.groovy index 06d3ca7e99..f13b7442ae 100644 --- a/buildSrc/src/main/groovy/QuasarPlugin.groovy +++ b/buildSrc/src/main/groovy/QuasarPlugin.groovy @@ -45,7 +45,7 @@ class QuasarPlugin implements Plugin { classpath: "${project.sourceSets.main.output.classesDir}:${project.sourceSets.main.output.resourcesDir}:${project.configurations.runtime.asPath}") project.delete "$project.sourceSets.main.output.resourcesDir/META-INF/suspendables", "$project.sourceSets.main.output.resourcesDir/META-INF/suspendable-supers" - if(Files.isRegularFile(project.sourceSets.main.output.classesDir)) { + if(project.sourceSets.main.output.classesDir.exists()) { ant.scanSuspendables( auto: false, suspendablesFile: "$project.sourceSets.main.output.resourcesDir/META-INF/suspendables",