Cleaned up build.gradle files.

This commit is contained in:
Clinton Alexander 2016-07-21 17:40:57 +01:00
parent ffc3c8f421
commit 188fc29436
6 changed files with 17 additions and 28 deletions

View File

@ -1,6 +1,5 @@
group 'com.r3corda' group 'com.r3corda'
apply plugin: 'java'
apply plugin: 'kotlin' apply plugin: 'kotlin'
apply plugin: 'application' apply plugin: 'application'
apply plugin: 'project-report' apply plugin: 'project-report'
@ -17,13 +16,13 @@ allprojects {
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
} }
// Our version: bump this on release.
group 'com.r3corda'
version '0.2-SNAPSHOT'
} }
subprojects { subprojects {
dependencies {
testCompile 'junit:junit:4.12'
}
jacocoTestReport { jacocoTestReport {
additionalSourceDirs = files(sourceSets.main.allSource.srcDirs) additionalSourceDirs = files(sourceSets.main.allSource.srcDirs)
sourceDirectories = 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 { repositories {
mavenLocal() mavenLocal()
mavenCentral() mavenCentral()
@ -174,18 +167,6 @@ task integrationTest(type: Test) {
} }
test.finalizedBy(integrationTest) 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) { task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
dependsOn = subprojects.test dependsOn = subprojects.test
@ -207,3 +188,16 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
}) })
} }
} }
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
}

View File

@ -61,7 +61,6 @@ class CanonicalizerPlugin implements Plugin<Project> {
} }
} }
apply plugin: 'java'
apply plugin: 'kotlin' apply plugin: 'kotlin'
apply plugin: CanonicalizerPlugin apply plugin: CanonicalizerPlugin

View File

@ -61,7 +61,6 @@ class CanonicalizerPlugin implements Plugin<Project> {
} }
} }
apply plugin: 'java'
apply plugin: 'kotlin' apply plugin: 'kotlin'
apply plugin: CanonicalizerPlugin apply plugin: CanonicalizerPlugin

View File

@ -1,4 +1,3 @@
apply plugin: 'java'
apply plugin: 'kotlin' apply plugin: 'kotlin'
apply plugin: QuasarPlugin apply plugin: QuasarPlugin
// Applying the maven plugin means this will get installed locally when running "gradle install" // Applying the maven plugin means this will get installed locally when running "gradle install"

View File

@ -1,7 +1,6 @@
group 'com.r3cev.prototyping' group 'com.r3cev.prototyping'
version '1.0-SNAPSHOT' version '1.0-SNAPSHOT'
apply plugin: 'java'
apply plugin: 'kotlin' apply plugin: 'kotlin'
sourceCompatibility = 1.5 sourceCompatibility = 1.5

View File

@ -1,4 +1,3 @@
apply plugin: 'java'
apply plugin: 'kotlin' apply plugin: 'kotlin'
apply plugin: QuasarPlugin apply plugin: QuasarPlugin