From 41c4016a839ca1d9f69b4e07bc9dd5324eddcc90 Mon Sep 17 00:00:00 2001 From: Stefano Franz Date: Mon, 14 Jan 2019 10:38:27 +0000 Subject: [PATCH] remove bundled finance app --- docs/source/changelog.rst | 3 +-- finance/build.gradle | 56 --------------------------------------- settings.gradle | 1 - 3 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 finance/build.gradle diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index c84fd90c0f..1d1b9da994 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -318,8 +318,7 @@ Version 4.0 * Finance CorDapp is now build as a sealed and signed JAR file. Custom classes can no longer be placed in the packages defined in Finance Cordapp or access it's non-public members. -* Finance CorDapp was split into two separate apps: ``corda-finance-contracts`` and ``corda-finance-workflows``, - ``corda-finance`` is kept for backward compatibility, it is recommended to use separated jars. +* Finance CorDapp was split into two separate apps: ``corda-finance-contracts`` and ``corda-finance-workflows``. * All sample CorDapps were split into separate apps: workflows and contracts to reflect new convention. It is recommended to structure your CorDapps this way, see :doc:`app-upgrade-notes` on upgrading your CorDapp. diff --git a/finance/build.gradle b/finance/build.gradle deleted file mode 100644 index cf7102534b..0000000000 --- a/finance/build.gradle +++ /dev/null @@ -1,56 +0,0 @@ -apply plugin: 'kotlin' -// Java Persistence API support: create no-arg constructor -// see: http://stackoverflow.com/questions/32038177/kotlin-with-jpa-default-constructor-hell -apply plugin: 'kotlin-jpa' -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 finance modules' - -/** - * NOTE: this build.gradle file is maintained for backwards compatibility purposes. - * It will build a `corda-finance.jar` including all Contracts and Flows. - * From Corda 4 it is strongly recommended that CorDapps dependent on the `corda-finance.jar` - * explicitly declare dependencies on either/both of the corda finance sub-modules: - * corda-finance-contract => generates `corda-finance-contract.jar` - * corda-finance-workflows => generates `corda-finance-workflows.jar` - * Third party CorDapps should remember to include these sub-module dependencies using the `cordapp` Corda Gradle plug-in - * cordapp project(':finance:workflows') - * cordapp project(':finance:contracts') - */ - -def mainProjects = [':finance:contracts',':finance:workflows', ':confidential-identities'] - -jar.dependsOn mainProjects.collect{ it+":compileJava"} -jar { - baseName 'corda-finance' - from files(mainProjects.collect{ project(it).sourceSets.main.output }) - duplicatesStrategy = DuplicatesStrategy.EXCLUDE -} - -cordapp { - signing { - enabled false - } - targetPlatformVersion corda_platform_version.toInteger() - minimumPlatformVersion 1 - contract { - name "Corda Finance Demo" - versionId 1 - vendor "R3" - licence "Open Source (Apache 2)" - } - workflow { - name "Corda Finance Demo" - versionId 1 - vendor "R3" - licence "Open Source (Apache 2)" - } -} - -publish { - name jar.baseName -} diff --git a/settings.gradle b/settings.gradle index 25dda61655..efd159544c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,6 @@ // output JAR from the capsule then the buildCordaJAR task goes into an infinite loop. rootProject.name = 'corda-project' include 'confidential-identities' -include 'finance' // maintained for backwards compatibility only include 'finance:contracts' include 'finance:workflows' include 'isolated'