mirror of
https://github.com/corda/corda.git
synced 2024-12-19 04:57:58 +00:00
Clear some cut-and-paste cruft out of our Gradle files. (#3511)
This commit is contained in:
parent
b8e6c47cfd
commit
d634cdcbac
@ -1,41 +1,23 @@
|
|||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = '1.2.40'
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "com.github.jengelman.gradle.plugins:shadow:$shadow_version"
|
||||||
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.3'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
apply plugin: 'kotlin'
|
||||||
id "org.jetbrains.kotlin.jvm"
|
apply plugin: 'application'
|
||||||
id 'com.github.johnrengelman.shadow' version '2.0.3'
|
apply plugin: 'com.github.johnrengelman.shadow'
|
||||||
id 'java'
|
|
||||||
id 'application'
|
|
||||||
}
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
||||||
compile group: 'info.picocli', name: 'picocli', version: '3.0.1'
|
compile "info.picocli:picocli:3.0.1"
|
||||||
testCompile group: 'junit', name: 'junit', version: '4.12'
|
testCompile "junit:junit:$junit_version"
|
||||||
}
|
|
||||||
compileKotlin {
|
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
compileTestKotlin {
|
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mainClassName = "net.corda.avalanche.MainKt"
|
mainClassName = "net.corda.avalanche.MainKt"
|
||||||
shadowJar {
|
shadowJar {
|
||||||
baseName = "avalanche"
|
baseName = "avalanche"
|
||||||
|
@ -1,33 +1,14 @@
|
|||||||
buildscript {
|
ext {
|
||||||
ext.commonsio_version = '2.6'
|
commonsio_version = '2.6'
|
||||||
ext.commonslogging_version = '1.2'
|
cucumber_version = '1.2.5'
|
||||||
ext.cucumber_version = '1.2.5'
|
crash_version = 'cce5a00f114343c1145c1d7756e1dd6df3ea984e'
|
||||||
ext.crash_version = 'cce5a00f114343c1145c1d7756e1dd6df3ea984e'
|
docker_client_version = '8.11.0'
|
||||||
ext.docker_client_version = '8.11.0'
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
jcenter()
|
|
||||||
url 'https://jitpack.io'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
group 'net.corda.behave'
|
group 'net.corda.behave'
|
||||||
|
|
||||||
apply plugin: 'java'
|
|
||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
sourceCompatibility = 1.8
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
behave {
|
behave {
|
||||||
java {
|
java {
|
||||||
@ -63,6 +44,7 @@ dependencies {
|
|||||||
|
|
||||||
compile "org.slf4j:log4j-over-slf4j:$slf4j_version"
|
compile "org.slf4j:log4j-over-slf4j:$slf4j_version"
|
||||||
compile "org.slf4j:jul-to-slf4j:$slf4j_version"
|
compile "org.slf4j:jul-to-slf4j:$slf4j_version"
|
||||||
|
compile "org.slf4j:jcl-over-slf4j:$slf4j_version"
|
||||||
compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
|
compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
|
||||||
compile "org.apache.logging.log4j:log4j-core:$log4j_version"
|
compile "org.apache.logging.log4j:log4j-core:$log4j_version"
|
||||||
|
|
||||||
@ -70,10 +52,9 @@ dependencies {
|
|||||||
compile "net.sf.jopt-simple:jopt-simple:$jopt_simple_version"
|
compile "net.sf.jopt-simple:jopt-simple:$jopt_simple_version"
|
||||||
|
|
||||||
// FastClasspathScanner: classpath scanning
|
// FastClasspathScanner: classpath scanning
|
||||||
compile 'io.github.lukehutch:fast-classpath-scanner:2.12.3'
|
compile "io.github.lukehutch:fast-classpath-scanner:$fast_classpath_scanner_version"
|
||||||
|
|
||||||
compile "commons-io:commons-io:$commonsio_version"
|
compile "commons-io:commons-io:$commonsio_version"
|
||||||
compile "commons-logging:commons-logging:$commonslogging_version"
|
|
||||||
compile "com.spotify:docker-client:$docker_client_version"
|
compile "com.spotify:docker-client:$docker_client_version"
|
||||||
compile "io.reactivex:rxjava:$rxjava_version"
|
compile "io.reactivex:rxjava:$rxjava_version"
|
||||||
|
|
||||||
@ -93,14 +74,6 @@ dependencies {
|
|||||||
behaveCompile "info.cukes:cucumber-picocontainer:$cucumber_version"
|
behaveCompile "info.cukes:cucumber-picocontainer:$cucumber_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin {
|
|
||||||
kotlinOptions.jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
|
|
||||||
compileTestKotlin {
|
|
||||||
kotlinOptions.jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
|
|
||||||
test {
|
test {
|
||||||
testLogging.showStandardStreams = true
|
testLogging.showStandardStreams = true
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ dependencies {
|
|||||||
compile project(':finance')
|
compile project(':finance')
|
||||||
|
|
||||||
// ObjectWeb Asm: a library for synthesising and working with JVM bytecode.
|
// ObjectWeb Asm: a library for synthesising and working with JVM bytecode.
|
||||||
compile "org.ow2.asm:asm:5.0.4"
|
compile "org.ow2.asm:asm:$asm_version"
|
||||||
|
|
||||||
compile "com.google.guava:guava:$guava_version"
|
compile "com.google.guava:guava:$guava_version"
|
||||||
|
|
||||||
|
@ -1,26 +1,5 @@
|
|||||||
buildscript {
|
ext {
|
||||||
// For sharing constants between builds
|
javaassist_version = "3.12.1.GA"
|
||||||
Properties constants = new Properties()
|
|
||||||
file("$projectDir/../../constants.properties").withInputStream { constants.load(it) }
|
|
||||||
|
|
||||||
ext.kotlin_version = constants.getProperty("kotlinVersion")
|
|
||||||
ext.javaassist_version = "3.12.1.GA"
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenLocal()
|
|
||||||
mavenCentral()
|
|
||||||
jcenter()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenLocal()
|
|
||||||
mavenCentral()
|
|
||||||
jcenter()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
@ -1,26 +1,5 @@
|
|||||||
buildscript {
|
ext {
|
||||||
// For sharing constants between builds
|
javaassist_version = "3.12.1.GA"
|
||||||
Properties constants = new Properties()
|
|
||||||
file("$projectDir/../../constants.properties").withInputStream { constants.load(it) }
|
|
||||||
|
|
||||||
ext.kotlin_version = constants.getProperty("kotlinVersion")
|
|
||||||
ext.javaassist_version = "3.12.1.GA"
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenLocal()
|
|
||||||
mavenCentral()
|
|
||||||
jcenter()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenLocal()
|
|
||||||
mavenCentral()
|
|
||||||
jcenter()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
@ -58,9 +58,7 @@ repositories {
|
|||||||
maven {
|
maven {
|
||||||
url 'https://dl.bintray.com/palantir/releases' // docker-compose-rule is published on bintray
|
url 'https://dl.bintray.com/palantir/releases' // docker-compose-rule is published on bintray
|
||||||
}
|
}
|
||||||
repositories {
|
|
||||||
maven { url 'https://jitpack.io' }
|
maven { url 'https://jitpack.io' }
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -11,19 +11,10 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "org.jetbrains.kotlin:kotlin-noarg:$kotlin_version"
|
classpath "com.github.jengelman.gradle.plugins:shadow:$shadow_version"
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
|
||||||
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenLocal()
|
|
||||||
mavenCentral()
|
|
||||||
jcenter()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
apply plugin: 'idea'
|
apply plugin: 'idea'
|
||||||
apply plugin: 'java'
|
apply plugin: 'java'
|
||||||
|
Loading…
Reference in New Issue
Block a user