ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-30 09:48:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cordformation now correctly includes and excludes cordapps.

Browse Source
This commit is contained in:
Clinton Alexander 2017-02-10 15:44:04 +00:00 committed by Clinton Alexander
parent 07c5645be5
commit 3b989f366c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,11 +191,10 @@ class Node {
*/ */
private void installDependencies() { private void installDependencies() {
def cordaJar = verifyAndGetCordaJar() def cordaJar = verifyAndGetCordaJar()
def cordappDeps = getCordappList()
def depsDir = new File(nodeDir, "dependencies") def depsDir = new File(nodeDir, "dependencies")
def coreDeps = project.zipTree(cordaJar).getFiles().collect { it.getName() } def coreDeps = project.zipTree(cordaJar).getFiles().collect { it.getName() }
def appDeps = project.configurations.runtime.filter { def appDeps = project.configurations.runtime.filter {
it != cordaJar && !cordappDeps.contains(it) && !coreDeps.contains(it.getName()) it != cordaJar && !project.configurations.cordapp.contains(it) && !coreDeps.contains(it.getName())
} }
project.copy { project.copy {
from appDeps from appDeps
@ -250,7 +249,7 @@ class Node {
*/ */
private Collection<File> getCordappList() { private Collection<File> getCordappList() {
return project.configurations.cordapp.files { return project.configurations.cordapp.files {
cordapps.contains("${it.group}:${it.name}:${it.version}") cordapps.contains(it.group + ":" + it.name + ":" + it.version)
} }
} }
} }

2
publish.properties
View File

@ -1 +1 @@
gradlePluginsVersion=0.7.1 gradlePluginsVersion=0.8