Merge pull request #1266 from corda/clint-cordappincludestring

Fixed a bug in cordformation when including cordapps

constants.properties

@@ -1,4 +1,4 @@
-gradlePluginsVersion=0.13.6
+gradlePluginsVersion=0.15.0
 kotlinVersion=1.1.1
 guavaVersion=21.0
 bouncycastleVersion=1.57

gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordformation.groovy

@@ -76,7 +76,7 @@ class Cordformation implements Plugin<Project> {
                                 "This can cause node stability problems. Please use 'corda' instead." +
                                 "See http://docs.corda.net/cordapp-build-systems.html")
                 } else {
-                    logger.trace("Including dependency: $it")
+                    logger.info("Including dependency in CorDapp JAR: $it")
                 }
             }
             return filteredDeps.collect { configurations.runtime.files it }.flatten().toSet()

gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Node.groovy

@@ -235,6 +235,8 @@ class Node extends CordformNode {
      * @return List of this node's cordapps.
      */
     private Collection<File> getCordappList() {
+        // Cordapps can sometimes contain a GString instance which fails the equality test with the Java string
+        List<String> cordapps = this.cordapps.collect { it.toString() }
         return project.configurations.cordapp.files {
             cordapps.contains(it.group + ":" + it.name + ":" + it.version)
         }