Merged in clint-cordformdepsfix (pull request #509)

Fixed some issues and inconsistencies with gradle plugins

build.gradle

@@ -26,8 +26,8 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
         classpath 'net.corda.plugins:publish-utils:0.5'
-        classpath 'net.corda.plugins:quasar-utils:0.5'
+        classpath 'net.corda.plugins:quasar-utils:0.5.1'
-        classpath 'net.corda.plugins:cordformation:0.5'
+        classpath 'net.corda.plugins:cordformation:0.5.1'
 
         // Can run 'gradle dependencyUpdates' to find new versions of things.
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'

gradle-plugins/build.gradle

@@ -20,7 +20,11 @@ apply plugin: 'maven-publish'
 
 allprojects {
     group 'net.corda'
-    version "$corda_published_version"
+    version "$corda_version"
+}
+
+subprojects {
+	task(install, dependsOn: 'publishToMavenLocal')
 }
 
 // Aliasing the publishToMavenLocal for simplicity.

gradle-plugins/publish-utils/build.gradle

@@ -34,8 +34,6 @@ bintray {
     }
 }
 
-task(install, dependsOn: 'publishToMavenLocal')
-
 publishing {
     publications {
         publishUtils(MavenPublication) {

gradle-plugins/quasar-utils/build.gradle

@@ -25,8 +25,6 @@ bintray {
     }
 }
 
-task(install, dependsOn: 'publishToMavenLocal')
-
 publishing {
     publications {
         quasarUtils(MavenPublication) {

gradle-plugins/quasar-utils/src/main/groovy/net/corda/plugins/QuasarPlugin.groovy

@@ -46,13 +46,14 @@ class QuasarPlugin implements Plugin<Project> {
             ant.taskdef(name:'scanSuspendables', classname:'co.paralleluniverse.fibers.instrument.SuspendablesScanner',
                     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(project.sourceSets.main.output.classesDir.exists()) {
                 ant.scanSuspendables(
                         auto:false,
                         suspendablesFile: "$project.sourceSets.main.output.resourcesDir/META-INF/suspendables",
                         supersFile: "$project.sourceSets.main.output.resourcesDir/META-INF/suspendable-supers") {
                     fileset(dir: project.sourceSets.main.output.classesDir)
                 }
-
+            }
         }
 
         project.jar.dependsOn project.quasarScan

samples/attachment-demo/build.gradle

@@ -1,20 +1,3 @@
-buildscript {
-    ext.corda_version = "0.6-SNAPSHOT"
-
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "net.corda.plugins:quasar-utils:$corda_version"
-        classpath "net.corda.plugins:publish-utils:$corda_version"
-        classpath "net.corda.plugins:cordformation:$corda_version"
-    }
-}
-
 apply plugin: 'java'
 apply plugin: 'kotlin'
 apply plugin: 'idea'

samples/irs-demo/build.gradle

@@ -1,18 +1,3 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "net.corda.plugins:quasar-utils:$corda_version"
-        classpath "net.corda.plugins:publish-utils:$corda_version"
-        classpath "net.corda.plugins:cordformation:$corda_version"
-    }
-}
-
 apply plugin: 'java'
 apply plugin: 'kotlin'
 apply plugin: 'idea'

samples/network-visualiser/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "net.corda.plugins:quasar-utils:$corda_version"
-    }
-}
-
 apply plugin: 'java'
 apply plugin: 'kotlin'
 apply plugin: 'idea'

samples/simm-valuation-demo/build.gradle

@@ -1,18 +1,5 @@
 buildscript {
     ext.strata_version = '1.0.0'
-
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "net.corda.plugins:quasar-utils:$corda_version"
-        classpath "net.corda.plugins:publish-utils:$corda_version"
-        classpath "net.corda.plugins:cordformation:$corda_version"
-    }
 }
 
 apply plugin: 'java'

samples/trader-demo/build.gradle

@@ -1,18 +1,3 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "net.corda.plugins:quasar-utils:$corda_version"
-        classpath "net.corda.plugins:publish-utils:$corda_version"
-        classpath "net.corda.plugins:cordformation:$corda_version"
-    }
-}
-
 apply plugin: 'java'
 apply plugin: 'kotlin'
 apply plugin: 'idea'