From e87a8ed496f6f72dc1828946da713ee0070eee9a Mon Sep 17 00:00:00 2001 From: Shams Asari Date: Thu, 10 Jan 2019 12:31:47 +0000 Subject: [PATCH] Added CorDapp metdata to confidential-identities and cleaned-up dependencies (#4540) --- confidential-identities/build.gradle | 14 +++++++++++++- finance/contracts/build.gradle | 3 +-- finance/workflows/build.gradle | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/confidential-identities/build.gradle b/confidential-identities/build.gradle index 38a2f43807..3e38d2a870 100644 --- a/confidential-identities/build.gradle +++ b/confidential-identities/build.gradle @@ -6,12 +6,13 @@ apply plugin: 'kotlin' apply plugin: CanonicalizerPlugin apply plugin: 'net.corda.plugins.publish-utils' apply plugin: 'net.corda.plugins.quasar-utils' +apply plugin: 'net.corda.plugins.cordapp' apply plugin: 'com.jfrog.artifactory' description 'Corda Experimental Confidential Identities' dependencies { - compile project(':core') + cordaCompile project(':core') testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version" testCompile "junit:junit:$junit_version" @@ -26,6 +27,17 @@ dependencies { testCompile "org.assertj:assertj-core:$assertj_version" } +cordapp { + targetPlatformVersion corda_platform_version.toInteger() + minimumPlatformVersion 1 + workflow { + name "Corda Experimental Confidential Identities" + versionId 1 + vendor "R3" + licence "Open Source (Apache 2)" + } +} + jar { baseName 'corda-confidential-identities' } diff --git a/finance/contracts/build.gradle b/finance/contracts/build.gradle index a9f8c820bd..b1af4dce87 100644 --- a/finance/contracts/build.gradle +++ b/finance/contracts/build.gradle @@ -14,8 +14,7 @@ dependencies { // Note: 3rd party CorDapps should remember to include the relevant Finance CorDapp dependencies using `cordapp` // cordapp project(':finance:workflows') // cordapp project(':finance:contracts') - cordapp project(':core') - cordapp project(':confidential-identities') + cordaCompile project(':core') // For JSON compile "com.fasterxml.jackson.core:jackson-databind:${jackson_version}" diff --git a/finance/workflows/build.gradle b/finance/workflows/build.gradle index 95c19859c5..7983d9d195 100644 --- a/finance/workflows/build.gradle +++ b/finance/workflows/build.gradle @@ -28,8 +28,8 @@ dependencies { // cordapp project(':finance:workflows') // cordapp project(':finance:contracts') cordaCompile project(':core') - compile project(':confidential-identities') - + + cordapp project(':confidential-identities') cordapp project(':finance:contracts') testCompile project(':test-utils')