From 188fc29436cfc7117e06f82cbf9e240b30900f40 Mon Sep 17 00:00:00 2001
From: Clinton Alexander <clinton.alexander@r3cev.com>
Date: Thu, 21 Jul 2016 17:40:57 +0100
Subject: [PATCH] Cleaned up build.gradle files.

---
 build.gradle                    | 40 ++++++++++++++-------------------
 contracts/build.gradle          |  1 -
 contracts/isolated/build.gradle |  1 -
 core/build.gradle               |  1 -
 experimental/build.gradle       |  1 -
 node/build.gradle               |  1 -
 6 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/build.gradle b/build.gradle
index 792331db16..c27ef89881 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,5 @@
 group 'com.r3corda'
 
-apply plugin: 'java'
 apply plugin: 'kotlin'
 apply plugin: 'application'
 apply plugin: 'project-report'
@@ -17,13 +16,13 @@ allprojects {
     tasks.withType(JavaCompile) {
         options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
     }
+
+    // Our version: bump this on release.
+    group 'com.r3corda'
+    version '0.2-SNAPSHOT'
 }
 
 subprojects {
-    dependencies {
-        testCompile 'junit:junit:4.12'
-    }
-
     jacocoTestReport {
         additionalSourceDirs = files(sourceSets.main.allSource.srcDirs)
         sourceDirectories = files(sourceSets.main.allSource.srcDirs)
@@ -61,12 +60,6 @@ buildscript {
     }
 }
 
-allprojects {
-    // Our version: bump this on release.
-    group 'com.r3corda'
-    version '0.2-SNAPSHOT'
-}
-
 repositories {
     mavenLocal()
     mavenCentral()
@@ -174,18 +167,6 @@ task integrationTest(type: Test) {
 }
 test.finalizedBy(integrationTest)
 
-tasks.withType(Test) {
-    reports.html.destination = file("${reporting.baseDir}/${name}")
-}
-
-quasarScan.dependsOn('classes', 'core:classes', 'contracts:classes', 'node:classes')
-
-applicationDistribution.into("bin") {
-    from(getRateFixDemo)
-    from(getIRSDemo)
-    from(getTraderDemo)
-    fileMode = 0755
-}
 
 task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
     dependsOn = subprojects.test
@@ -206,4 +187,17 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
             it.exists()
         })
     }
+}
+
+tasks.withType(Test) {
+    reports.html.destination = file("${reporting.baseDir}/${name}")
+}
+
+quasarScan.dependsOn('classes', 'core:classes', 'contracts:classes', 'node:classes')
+
+applicationDistribution.into("bin") {
+    from(getRateFixDemo)
+    from(getIRSDemo)
+    from(getTraderDemo)
+    fileMode = 0755
 }
\ No newline at end of file
diff --git a/contracts/build.gradle b/contracts/build.gradle
index d83a41f277..3cbe693a47 100644
--- a/contracts/build.gradle
+++ b/contracts/build.gradle
@@ -61,7 +61,6 @@ class CanonicalizerPlugin implements Plugin<Project> {
     }
 }
 
-apply plugin: 'java'
 apply plugin: 'kotlin'
 
 apply plugin: CanonicalizerPlugin
diff --git a/contracts/isolated/build.gradle b/contracts/isolated/build.gradle
index 6e4f0fe87a..480fc6df48 100644
--- a/contracts/isolated/build.gradle
+++ b/contracts/isolated/build.gradle
@@ -61,7 +61,6 @@ class CanonicalizerPlugin implements Plugin<Project> {
     }
 }
 
-apply plugin: 'java'
 apply plugin: 'kotlin'
 
 apply plugin: CanonicalizerPlugin
diff --git a/core/build.gradle b/core/build.gradle
index 85102ed784..c7ef1a91a3 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: 'java'
 apply plugin: 'kotlin'
 apply plugin: QuasarPlugin
 // Applying the maven plugin means this will get installed locally when running "gradle install"
diff --git a/experimental/build.gradle b/experimental/build.gradle
index c7f8ff8c45..f4731cff0b 100644
--- a/experimental/build.gradle
+++ b/experimental/build.gradle
@@ -1,7 +1,6 @@
 group 'com.r3cev.prototyping'
 version '1.0-SNAPSHOT'
 
-apply plugin: 'java'
 apply plugin: 'kotlin'
 
 sourceCompatibility = 1.5
diff --git a/node/build.gradle b/node/build.gradle
index ad538b6953..1a182f8e4b 100644
--- a/node/build.gradle
+++ b/node/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: 'java'
 apply plugin: 'kotlin'
 apply plugin: QuasarPlugin