ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 04:57:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-1964: Resolve some Gradle warnings which will soon become errors. (#3911)

Browse Source
This commit is contained in:
Chris Rankin 2018-09-07 14:26:35 +01:00 committed by GitHub
parent db6c7f38a5
commit 4f8a564104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/shell-cli/build.gradle
View File

@ -2,9 +2,7 @@ description 'Corda Shell CLI'
buildscript { buildscript {
repositories { repositories {
maven { gradlePluginPortal()
url "https://plugins.gradle.org/m2/"
}
} }
dependencies { dependencies {
classpath "com.github.jengelman.gradle.plugins:shadow:$shadow_version" classpath "com.github.jengelman.gradle.plugins:shadow:$shadow_version"
@ -12,15 +10,16 @@ buildscript {
} }
apply plugin: 'application' apply plugin: 'application'
// We need to set mainClassName before applying the shadow plugin.
mainClassName = 'net.corda.tools.shell.StandaloneShellKt'
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'net.corda.plugins.publish-utils' apply plugin: 'net.corda.plugins.publish-utils'
apply plugin: 'com.jfrog.artifactory' apply plugin: 'com.jfrog.artifactory'
mainClassName = 'net.corda.tools.shell.StandaloneShellKt'
dependencies { dependencies {
compile project(':tools:shell') compile project(':tools:shell')
compile group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version compile "org.slf4j:slf4j-simple:$slf4j_version"
testCompile(project(':test-utils')) { testCompile(project(':test-utils')) {
exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
@ -36,10 +35,11 @@ shadowJar {
} }
task buildShellCli(dependsOn: shadowJar) task buildShellCli(dependsOn: shadowJar)
assemble.dependsOn buildShellCli
artifacts { artifacts {
publish shadowJar { publish shadowJar {
classifier "" classifier = ""
} }
} }

13
tools/shell/build.gradle
View File

@ -61,24 +61,25 @@ dependencies {
compile "com.jcabi:jcabi-manifests:1.1" compile "com.jcabi:jcabi-manifests:1.1"
// For logging, required for ANSIProgressRenderer. // For logging, required for ANSIProgressRenderer.
compile "org.apache.logging.log4j:log4j-core:${log4j_version}" compile "org.apache.logging.log4j:log4j-core:$log4j_version"
// Unit testing helpers. // Unit testing helpers.
testCompile "junit:junit:$junit_version" testCompile "junit:junit:$junit_version"
testCompile "org.assertj:assertj-core:${assertj_version}" testCompile "org.assertj:assertj-core:$assertj_version"
testCompile project(':test-utils') testCompile project(':test-utils')
testCompile project(':finance') testCompile project(':finance')
// Integration test helpers.
integrationTestCompile "junit:junit:$junit_version"
integrationTestCompile "org.assertj:assertj-core:${assertj_version}"
// Jsh: Testing SSH server. // Jsh: Testing SSH server.
integrationTestCompile "com.jcraft:jsch:$jsch_version" integrationTestCompile "com.jcraft:jsch:$jsch_version"
integrationTestCompile project(':node-driver') integrationTestCompile project(':node-driver')
} }
tasks.withType(JavaCompile) {
// Resolves a Gradle warning about not scanning for pre-processors.
options.compilerArgs << '-proc:none'
}
task integrationTest(type: Test) { task integrationTest(type: Test) {
testClassesDirs = sourceSets.integrationTest.output.classesDirs testClassesDirs = sourceSets.integrationTest.output.classesDirs
classpath = sourceSets.integrationTest.runtimeClasspath classpath = sourceSets.integrationTest.runtimeClasspath