ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-12 04:08:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merged in clint-dupedepsfix (pull request #583)

Browse Source 
Fixed most duplicate dependencies between cordapps and the corda.jar.
This commit is contained in:
Clinton Alexander
2016-11-29 16:20:36 +00:00
parent d87e027bd6 cc2b472947
commit fb41300ce0
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -2,7 +2,7 @@ buildscript {
// Our version: bump this on release. // Our version: bump this on release.
ext.corda_version = "0.6-SNAPSHOT" ext.corda_version = "0.6-SNAPSHOT"
ext.gradle_plugins_version = "0.5.6" ext.gradle_plugins_version = "0.5.7"
ext.kotlin_version = '1.0.5' ext.kotlin_version = '1.0.5'
ext.quasar_version = '0.7.6' ext.quasar_version = '0.7.6'
ext.asm_version = '0.5.3' ext.asm_version = '0.5.3'

2
gradle-plugins/build.gradle
View File

@ -2,7 +2,7 @@
// or if you are developing these plugins. See the readme for more information. // or if you are developing these plugins. See the readme for more information.
buildscript { buildscript {
ext.gradle_plugins_version = "0.5.6" // Our version: bump this on release. ext.gradle_plugins_version = "0.5.7" // Our version: bump this on release.
ext.corda_published_version = "0.5" // Depend on our existing published publishing plugin. ext.corda_published_version = "0.5" // Depend on our existing published publishing plugin.
repositories { repositories {

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

@ -206,7 +206,10 @@ class Node {
def cordaJar = verifyAndGetCordaJar() def cordaJar = verifyAndGetCordaJar()
def cordappDeps = getCordappList() def cordappDeps = getCordappList()
def depsDir = new File(nodeDir, "dependencies") def depsDir = new File(nodeDir, "dependencies")
def appDeps = project.configurations.runtime.filter { it != cordaJar && !cordappDeps.contains(it) } def coreDeps = project.zipTree(cordaJar).getFiles().collect { it.getName() }
def appDeps = project.configurations.runtime.filter {
it != cordaJar && !cordappDeps.contains(it) && !coreDeps.contains(it.getName())
}
project.copy { project.copy {
from appDeps from appDeps
into depsDir into depsDir