Corrected dependency specifications for Corda core modules.

Author: Clintonio

java-source/build.gradle

@@ -1,11 +1,3 @@
-apply plugin: 'java'
-apply plugin: 'kotlin'
-apply plugin: 'idea'
-apply plugin: 'net.corda.plugins.publish-utils'
-apply plugin: 'net.corda.plugins.cordformation'
-apply plugin: 'net.corda.plugins.quasar-utils'
-apply plugin: 'maven-publish'
-
 repositories {
     mavenLocal()
     jcenter()
@@ -14,6 +6,14 @@ repositories {
     maven { url 'https://jitpack.io' }
 }
 
+apply plugin: 'java'
+apply plugin: 'kotlin'
+apply plugin: 'idea'
+apply plugin: 'net.corda.plugins.publish-utils'
+apply plugin: 'net.corda.plugins.cordformation'
+apply plugin: 'net.corda.plugins.quasar-utils'
+apply plugin: 'maven-publish'
+
 sourceSets {
     main {
         resources {
@@ -32,13 +32,13 @@ dependencies {
     testCompile "junit:junit:$junit_version"
 
     // Corda integration dependencies
-    compile "net.corda:corda-core:$corda_release_version"
-    compile "net.corda:corda-finance:$corda_release_version"
-    compile "net.corda:corda-jackson:$corda_release_version"
-    compile "net.corda:corda-rpc:$corda_release_version"
-    compile "net.corda:corda-webserver-impl:$corda_release_version"
-    runtime "net.corda:corda:$corda_release_version"
-    runtime "net.corda:corda-webserver:$corda_release_version"
+    cordaCompile "net.corda:corda-core:$corda_release_version"
+    cordaCompile "net.corda:corda-finance:$corda_release_version"
+    cordaCompile "net.corda:corda-jackson:$corda_release_version"
+    cordaCompile "net.corda:corda-rpc:$corda_release_version"
+    cordaCompile "net.corda:corda-webserver-impl:$corda_release_version"
+    cordaRuntime "net.corda:corda:$corda_release_version"
+    cordaRuntime "net.corda:corda-webserver:$corda_release_version"
 
     testCompile "net.corda:corda-test-utils:$corda_release_version"
 

kotlin-source/build.gradle

@@ -1,11 +1,3 @@
-apply plugin: 'java'
-apply plugin: 'kotlin'
-apply plugin: 'idea'
-apply plugin: 'net.corda.plugins.publish-utils'
-apply plugin: 'net.corda.plugins.cordformation'
-apply plugin: 'net.corda.plugins.quasar-utils'
-apply plugin: 'maven-publish'
-
 repositories {
     mavenLocal()
     jcenter()
@@ -14,6 +6,14 @@ repositories {
     maven { url 'https://jitpack.io' }
 }
 
+apply plugin: 'java'
+apply plugin: 'kotlin'
+apply plugin: 'idea'
+apply plugin: 'net.corda.plugins.publish-utils'
+apply plugin: 'net.corda.plugins.cordformation'
+apply plugin: 'net.corda.plugins.quasar-utils'
+apply plugin: 'maven-publish'
+
 sourceSets {
     main {
         resources {
@@ -33,13 +33,13 @@ dependencies {
     testCompile "junit:junit:$junit_version"
 
     // Corda integration dependencies
-    compile "net.corda:corda-core:$corda_release_version"
-    compile "net.corda:corda-finance:$corda_release_version"
-    compile "net.corda:corda-jackson:$corda_release_version"
-    compile "net.corda:corda-rpc:$corda_release_version"
-    compile "net.corda:corda-webserver-impl:$corda_release_version"
-    runtime "net.corda:corda:$corda_release_version"
-    runtime "net.corda:corda-webserver:$corda_release_version"
+    cordaCompile "net.corda:corda-core:$corda_release_version"
+    cordaCompile "net.corda:corda-finance:$corda_release_version"
+    cordaCompile "net.corda:corda-jackson:$corda_release_version"
+    cordaCompile "net.corda:corda-rpc:$corda_release_version"
+    cordaCompile "net.corda:corda-webserver-impl:$corda_release_version"
+    cordaRuntime "net.corda:corda:$corda_release_version"
+    cordaRuntime "net.corda:corda-webserver:$corda_release_version"
 
     testCompile "net.corda:corda-test-utils:$corda_release_version"