From 8415a01a478f2bc7e82449a91a9be0cbdf0b0300 Mon Sep 17 00:00:00 2001 From: Clinton Date: Tue, 12 Sep 2017 19:18:09 +0100 Subject: [PATCH] Cordform common is now a part of the gradle plugin suite (#1474) Cordform common is now a full gradle plugin and all related gradle hacks are removed. --- docs/source/corda-repo-layout.rst | 1 - gradle-plugins/cordform-common/README.md | 4 ++++ .../cordform-common}/build.gradle | 0 .../src/main/java/net/corda/cordform/CordformContext.java | 0 .../src/main/java/net/corda/cordform/CordformDefinition.java | 0 .../src/main/java/net/corda/cordform/CordformNode.java | 0 .../src/main/java/net/corda/cordform/NodeDefinition.java | 0 gradle-plugins/settings.gradle | 4 +--- node/build.gradle | 2 +- settings.gradle | 3 +-- testing/node-driver/build.gradle | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 gradle-plugins/cordform-common/README.md rename {cordform-common => gradle-plugins/cordform-common}/build.gradle (100%) rename {cordform-common => gradle-plugins/cordform-common}/src/main/java/net/corda/cordform/CordformContext.java (100%) rename {cordform-common => gradle-plugins/cordform-common}/src/main/java/net/corda/cordform/CordformDefinition.java (100%) rename {cordform-common => gradle-plugins/cordform-common}/src/main/java/net/corda/cordform/CordformNode.java (100%) rename {cordform-common => gradle-plugins/cordform-common}/src/main/java/net/corda/cordform/NodeDefinition.java (100%) diff --git a/docs/source/corda-repo-layout.rst b/docs/source/corda-repo-layout.rst index 6a67deb285..9c8fc9cb1f 100644 --- a/docs/source/corda-repo-layout.rst +++ b/docs/source/corda-repo-layout.rst @@ -7,7 +7,6 @@ The Corda repository comprises the following folders: * **client** contains libraries for connecting to a node, working with it remotely and binding server-side data to JavaFX UI * **config** contains logging configurations and the default node configuration file -* **cordform-common** contains utilities related to building and running nodes * **core** containing the core Corda libraries such as crypto functions, types for Corda's building blocks: states, contracts, transactions, attachments, etc. and some interfaces for nodes and protocols * **docs** contains the Corda docsite in restructured text format as well as the built docs in html. The docs can be diff --git a/gradle-plugins/cordform-common/README.md b/gradle-plugins/cordform-common/README.md new file mode 100644 index 0000000000..8b83c20e93 --- /dev/null +++ b/gradle-plugins/cordform-common/README.md @@ -0,0 +1,4 @@ +# Cordform Common + +This project contains common node types that both the Corda gradle plugin suite and Corda project +require in order to build Corda nodes. \ No newline at end of file diff --git a/cordform-common/build.gradle b/gradle-plugins/cordform-common/build.gradle similarity index 100% rename from cordform-common/build.gradle rename to gradle-plugins/cordform-common/build.gradle diff --git a/cordform-common/src/main/java/net/corda/cordform/CordformContext.java b/gradle-plugins/cordform-common/src/main/java/net/corda/cordform/CordformContext.java similarity index 100% rename from cordform-common/src/main/java/net/corda/cordform/CordformContext.java rename to gradle-plugins/cordform-common/src/main/java/net/corda/cordform/CordformContext.java diff --git a/cordform-common/src/main/java/net/corda/cordform/CordformDefinition.java b/gradle-plugins/cordform-common/src/main/java/net/corda/cordform/CordformDefinition.java similarity index 100% rename from cordform-common/src/main/java/net/corda/cordform/CordformDefinition.java rename to gradle-plugins/cordform-common/src/main/java/net/corda/cordform/CordformDefinition.java diff --git a/cordform-common/src/main/java/net/corda/cordform/CordformNode.java b/gradle-plugins/cordform-common/src/main/java/net/corda/cordform/CordformNode.java similarity index 100% rename from cordform-common/src/main/java/net/corda/cordform/CordformNode.java rename to gradle-plugins/cordform-common/src/main/java/net/corda/cordform/CordformNode.java diff --git a/cordform-common/src/main/java/net/corda/cordform/NodeDefinition.java b/gradle-plugins/cordform-common/src/main/java/net/corda/cordform/NodeDefinition.java similarity index 100% rename from cordform-common/src/main/java/net/corda/cordform/NodeDefinition.java rename to gradle-plugins/cordform-common/src/main/java/net/corda/cordform/NodeDefinition.java diff --git a/gradle-plugins/settings.gradle b/gradle-plugins/settings.gradle index 990b7b284c..f71f2da269 100644 --- a/gradle-plugins/settings.gradle +++ b/gradle-plugins/settings.gradle @@ -2,6 +2,4 @@ rootProject.name = 'corda-gradle-plugins' include 'publish-utils' include 'quasar-utils' include 'cordformation' -include 'cordform-common' -// TODO: Look into `includeFlat` -project(':cordform-common').projectDir = new File("$settingsDir/../cordform-common") \ No newline at end of file +include 'cordform-common' \ No newline at end of file diff --git a/node/build.gradle b/node/build.gradle index 6e8c12781a..4afebf95e2 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -78,7 +78,7 @@ processSmokeTestResources { dependencies { compile project(':node-api') compile project(':client:rpc') - compile project(':cordform-common') + compile "net.corda.plugins:cordform-common:$gradle_plugins_version" compile "com.google.code.findbugs:jsr305:3.0.1" diff --git a/settings.gradle b/settings.gradle index e1beec48a7..4d2f595935 100644 --- a/settings.gradle +++ b/settings.gradle @@ -38,5 +38,4 @@ include 'samples:irs-demo' include 'samples:network-visualiser' include 'samples:simm-valuation-demo' include 'samples:notary-demo' -include 'samples:bank-of-corda-demo' -include 'cordform-common' +include 'samples:bank-of-corda-demo' \ No newline at end of file diff --git a/testing/node-driver/build.gradle b/testing/node-driver/build.gradle index 2196330ae4..8a9085d179 100644 --- a/testing/node-driver/build.gradle +++ b/testing/node-driver/build.gradle @@ -28,7 +28,7 @@ sourceSets { dependencies { compile project(':test-utils') - compile project(':cordform-common') + compile "net.corda.plugins:cordform-common:$gradle_plugins_version" // Integration test helpers integrationTestCompile "org.assertj:assertj-core:${assertj_version}"