From ca5ea1e25d9128efe2d592781bbe1f93f01a4633 Mon Sep 17 00:00:00 2001 From: Matthew Nesbit Date: Wed, 16 Aug 2017 17:44:29 +0100 Subject: [PATCH] Fix a bug where when using a groovy string a cordapp will not be included because of a string and GString equality failure. --- constants.properties | 2 +- .../src/main/groovy/net/corda/plugins/Cordformation.groovy | 2 +- .../cordformation/src/main/groovy/net/corda/plugins/Node.groovy | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/constants.properties b/constants.properties index 4567dcffbb..b6155a12a4 100644 --- a/constants.properties +++ b/constants.properties @@ -1,4 +1,4 @@ -gradlePluginsVersion=0.13.6 +gradlePluginsVersion=0.15.0 kotlinVersion=1.1.1 guavaVersion=21.0 bouncycastleVersion=1.57 diff --git a/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordformation.groovy b/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordformation.groovy index edd74182f2..8b0076cfb2 100644 --- a/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordformation.groovy +++ b/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordformation.groovy @@ -76,7 +76,7 @@ class Cordformation implements Plugin { "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: $it") } } return filteredDeps.collect { configurations.runtime.files it }.flatten().toSet() diff --git a/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Node.groovy b/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Node.groovy index fb2ea88550..f530928695 100644 --- a/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Node.groovy +++ b/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 getCordappList() { + // Cordapps can sometimes contain a GString instance which fails the equality test with the Java string + List cordapps = this.cordapps.collect { it.toString() } return project.configurations.cordapp.files { cordapps.contains(it.group + ":" + it.name + ":" + it.version) }