ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-20 03:36:29 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Renamed corda configuration in gradle to cordaCompile to be more explicit. (#1131)

Browse Source 
* Renamed corda configuration in gradle to cordaCompile to be more explicit.

* Bumped version number of gradle plugins.
This commit is contained in:
Clinton 2017-07-27 17:53:51 +01:00 committed by Clinton Alexander
parent 68d05eee04
commit 3f5017f26b
10 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build.gradle
View File

@ -168,22 +168,23 @@ repositories {
} }
} }
// TODO: Corda root project currently produces a dummy cordapp when it shouldn't.
// Required for building out the fat JAR. // Required for building out the fat JAR.
dependencies { dependencies {
compile project(':node') cordaCompile project(':node')
compile "com.google.guava:guava:$guava_version" compile "com.google.guava:guava:$guava_version"
// Set to compile to ensure it exists now deploy nodes no longer relies on build // Set to corda compile to ensure it exists now deploy nodes no longer relies on build
compile project(path: ":node:capsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":node:capsule", configuration: 'runtimeArtifacts')
compile project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
// For the buildCordappDependenciesJar task // For the buildCordappDependenciesJar task
runtime project(':client:jfx') cordaRuntime project(':client:jfx')
runtime project(':client:mock') cordaRuntime project(':client:mock')
runtime project(':client:rpc') cordaRuntime project(':client:rpc')
runtime project(':core') cordaRuntime project(':core')
runtime project(':finance') cordaRuntime project(':finance')
runtime project(':webserver') cordaRuntime project(':webserver')
testCompile project(':test-utils') testCompile project(':test-utils')
} }

2
constants.properties
View File

@ -1,4 +1,4 @@
gradlePluginsVersion=0.13.4 gradlePluginsVersion=0.13.6
kotlinVersion=1.1.1 kotlinVersion=1.1.1
guavaVersion=21.0 guavaVersion=21.0
bouncycastleVersion=1.57 bouncycastleVersion=1.57

18
docs/source/cordapp-build-systems.rst
View File

@ -28,15 +28,15 @@ Building against Corda
To build against Corda you must do the following to your ``build.gradle``; To build against Corda you must do the following to your ``build.gradle``;
* Add the ``net.corda:corda:<version>`` JAR as a ``cordaRuntime`` dependency. * Add the ``net.corda:corda:<version>`` JAR as a ``cordaRuntime`` dependency.
* Add each compile dependency (eg ``corda-core``) as a ``corda`` dependency. * Add each compile dependency (eg ``corda-core``) as a ``cordaCompile`` dependency.
To make use of the Corda test facilities you must; To make use of the Corda test facilities you must;
* Add ``net.corda:corda-test-utils:<version>`` as a ``testCompile`` dependency (eg; a default Java/Kotlin compile task). * Add ``net.corda:corda-test-utils:<version>`` as a ``testCompile`` dependency (eg; a default Java/Kotlin compile task).
.. warning:: Never include ``corda-test-utils`` as a ``compile`` or ``corda`` dependency. .. warning:: Never include ``corda-test-utils`` as a ``compile`` or ``cordaCompile`` dependency.
These configurations work by the ``cordformation`` plugin adding ``corda`` as a new configuration that ``compile`` These configurations work by the ``cordformation`` plugin adding ``cordaCompile`` as a new configuration that ``compile``
extends from, and ``cordaRuntime`` which ``runtime`` extends from. extends from, and ``cordaRuntime`` which ``runtime`` extends from.
Choosing your Corda version Choosing your Corda version
@ -93,12 +93,12 @@ is already correctly configured and this is for reference only;
dependencies { dependencies {
// Corda integration dependencies // Corda integration dependencies
corda "net.corda:corda-core:$corda_release_version" cordaCompile "net.corda:corda-core:$corda_release_version"
corda "net.corda:corda-finance:$corda_release_version" cordaCompile "net.corda:corda-finance:$corda_release_version"
corda "net.corda:corda-jackson:$corda_release_version" cordaCompile "net.corda:corda-jackson:$corda_release_version"
corda "net.corda:corda-rpc:$corda_release_version" cordaCompile "net.corda:corda-rpc:$corda_release_version"
corda "net.corda:corda-node-api:$corda_release_version" cordaCompile "net.corda:corda-node-api:$corda_release_version"
corda "net.corda:corda-webserver-impl:$corda_release_version" cordaCompile "net.corda:corda-webserver-impl:$corda_release_version"
cordaRuntime "net.corda:corda:$corda_release_version" cordaRuntime "net.corda:corda:$corda_release_version"
cordaRuntime "net.corda:corda-webserver:$corda_release_version" cordaRuntime "net.corda:corda-webserver:$corda_release_version"
testCompile "net.corda:corda-test-utils:$corda_release_version" testCompile "net.corda:corda-test-utils:$corda_release_version"

4
gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordformation.groovy
View File

@ -11,7 +11,7 @@ import org.gradle.api.artifacts.Configuration
class Cordformation implements Plugin<Project> { class Cordformation implements Plugin<Project> {
void apply(Project project) { void apply(Project project) {
createCompileConfiguration("cordapp", project) createCompileConfiguration("cordapp", project)
createCompileConfiguration("corda", project) createCompileConfiguration("cordaCompile", project)
Configuration configuration = project.configurations.create("cordaRuntime") Configuration configuration = project.configurations.create("cordaRuntime")
configuration.transitive = false configuration.transitive = false
@ -65,7 +65,7 @@ class Cordformation implements Plugin<Project> {
project.with { project.with {
// The direct dependencies of this project // The direct dependencies of this project
def excludeDeps = configurations.cordapp.allDependencies + configurations.corda.allDependencies + configurations.cordaRuntime.allDependencies def excludeDeps = configurations.cordapp.allDependencies + configurations.cordaCompile.allDependencies + configurations.cordaRuntime.allDependencies
def directDeps = configurations.runtime.allDependencies - excludeDeps def directDeps = configurations.runtime.allDependencies - excludeDeps
// We want to filter out anything Corda related or provided by Corda, like kotlin-stdlib and quasar // We want to filter out anything Corda related or provided by Corda, like kotlin-stdlib and quasar
def filteredDeps = directDeps.findAll { excludes.collect { exclude -> (exclude.group == it.group) && (exclude.name == it.name) }.findAll { it }.isEmpty() } def filteredDeps = directDeps.findAll { excludes.collect { exclude -> (exclude.group == it.group) && (exclude.name == it.name) }.findAll { it }.isEmpty() }

10
samples/attachment-demo/build.gradle
View File

@ -26,11 +26,11 @@ dependencies {
testCompile "junit:junit:$junit_version" testCompile "junit:junit:$junit_version"
// Corda integration dependencies // Corda integration dependencies
corda project(path: ":node:capsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":node:capsule", configuration: 'runtimeArtifacts')
corda project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
corda project(':core') cordaCompile project(':core')
corda project(':webserver') cordaCompile project(':webserver')
corda project(':test-utils') cordaCompile project(':test-utils')
} }
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) { task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {

16
samples/bank-of-corda-demo/build.gradle
View File

@ -26,14 +26,14 @@ dependencies {
testCompile "junit:junit:$junit_version" testCompile "junit:junit:$junit_version"
// Corda integration dependencies // Corda integration dependencies
corda project(path: ":node:capsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":node:capsule", configuration: 'runtimeArtifacts')
corda project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
corda project(':core') cordaCompile project(':core')
corda project(':client:jfx') cordaCompile project(':client:jfx')
corda project(':client:rpc') cordaCompile project(':client:rpc')
corda project(':finance') cordaCompile project(':finance')
corda project(':webserver') cordaCompile project(':webserver')
corda project(':test-utils') cordaCompile project(':test-utils')
// Javax is required for webapis // Javax is required for webapis
compile "org.glassfish.jersey.core:jersey-server:${jersey_version}" compile "org.glassfish.jersey.core:jersey-server:${jersey_version}"

10
samples/irs-demo/build.gradle
View File

@ -28,11 +28,11 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
// Corda integration dependencies // Corda integration dependencies
corda project(path: ":node:capsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":node:capsule", configuration: 'runtimeArtifacts')
corda project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
corda project(':core') cordaCompile project(':core')
corda project(':finance') cordaCompile project(':finance')
corda project(':webserver') cordaCompile project(':webserver')
// Javax is required for webapis // Javax is required for webapis
compile "org.glassfish.jersey.core:jersey-server:${jersey_version}" compile "org.glassfish.jersey.core:jersey-server:${jersey_version}"

14
samples/notary-demo/build.gradle
View File

@ -18,13 +18,13 @@ dependencies {
testCompile "junit:junit:$junit_version" testCompile "junit:junit:$junit_version"
// Corda integration dependencies // Corda integration dependencies
corda project(path: ":node:capsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":node:capsule", configuration: 'runtimeArtifacts')
corda project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
corda project(':core') cordaCompile project(':core')
corda project(':client:jfx') cordaCompile project(':client:jfx')
corda project(':client:rpc') cordaCompile project(':client:rpc')
corda project(':test-utils') cordaCompile project(':test-utils')
corda project(':cordform-common') cordaCompile project(':cordform-common')
} }
idea { idea {

10
samples/simm-valuation-demo/build.gradle
View File

@ -29,11 +29,11 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
// Corda integration dependencies // Corda integration dependencies
corda project(path: ":node:capsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":node:capsule", configuration: 'runtimeArtifacts')
corda project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
corda project(':core') cordaCompile project(':core')
corda project(':webserver') cordaCompile project(':webserver')
corda project(':finance') cordaCompile project(':finance')
// Cordapp dependencies // Cordapp dependencies
// Specify your cordapp's dependencies below, including dependent cordapps // Specify your cordapp's dependencies below, including dependent cordapps

8
samples/trader-demo/build.gradle
View File

@ -25,10 +25,10 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
// Corda integration dependencies // Corda integration dependencies
corda project(path: ":node:capsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":node:capsule", configuration: 'runtimeArtifacts')
corda project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') cordaCompile project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
corda project(':core') cordaCompile project(':core')
corda project(':finance') cordaCompile project(':finance')
// Corda Plugins: dependent flows and services // Corda Plugins: dependent flows and services
cordapp project(':samples:bank-of-corda-demo') cordapp project(':samples:bank-of-corda-demo')