Fixed a crash in cordformation when trying to build nodes for a project with a file as a dependency and any other dependencies without a group

This commit is contained in:
Clinton Alexander 2017-09-04 15:20:44 +01:00
parent f0b2b0a566
commit 40146cdbc0
2 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
gradlePluginsVersion=0.15.2 gradlePluginsVersion=0.16.0
kotlinVersion=1.1.4 kotlinVersion=1.1.4
guavaVersion=21.0 guavaVersion=21.0
bouncycastleVersion=1.57 bouncycastleVersion=1.57

View File

@ -71,7 +71,7 @@ class Cordformation implements Plugin<Project> {
def filteredDeps = directDeps.findAll { excludes.collect { exclude -> (exclude.group == it.group) && (exclude.name == it.name) }.findAll { it }.isEmpty() } def filteredDeps = directDeps.findAll { excludes.collect { exclude -> (exclude.group == it.group) && (exclude.name == it.name) }.findAll { it }.isEmpty() }
filteredDeps.each { filteredDeps.each {
// net.corda may be a core dependency which shouldn't be included in this cordapp so give a warning // net.corda may be a core dependency which shouldn't be included in this cordapp so give a warning
if(it.group.contains('net.corda.')) { if(it.group && it.group.contains('net.corda.')) {
logger.warn("You appear to have included a Corda platform component ($it) using a 'compile' or 'runtime' dependency." + logger.warn("You appear to have included a Corda platform component ($it) using a 'compile' or 'runtime' dependency." +
"This can cause node stability problems. Please use 'corda' instead." + "This can cause node stability problems. Please use 'corda' instead." +
"See http://docs.corda.net/cordapp-build-systems.html") "See http://docs.corda.net/cordapp-build-systems.html")