Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

import test dependencies from testArtifacts rather than archives. #455

Merged
merged 1 commit into from
Apr 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions codegen/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ description 'web3j project code generators'
dependencies {
compile project(':core'),
"com.squareup:javapoet:$javapoetVersion"
testCompile project(path: ':core', configuration: 'testArtifacts')
}
30 changes: 0 additions & 30 deletions codegen/src/test/java/org/web3j/TempFileProvider.java

This file was deleted.

4 changes: 2 additions & 2 deletions console/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ dependencies {
compile project(':codegen'),
project(':infura')
runtime "org.slf4j:slf4j-nop:$slf4jVersion" // prevent logging of the library to the console
testCompile project(path: ':crypto', configuration: 'archives'),
project(path: ':core', configuration: 'archives')
testCompile project(path: ':crypto', configuration: 'testArtifacts'),
project(path: ':core', configuration: 'testArtifacts')
}

// Build command line library release with target distShadowZip
Expand Down
10 changes: 9 additions & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
"com.squareup.okhttp3:okhttp:$okhttpVersion",
"com.squareup.okhttp3:logging-interceptor:$okhttpVersion",
"io.reactivex:rxjava:$rxjavaVersion"
testCompile project(path: ':crypto', configuration: 'archives'),
testCompile project(path: ':crypto', configuration: 'testArtifacts'),
"nl.jqno.equalsverifier:equalsverifier:$equalsverifierVersion"
}

Expand All @@ -36,3 +36,11 @@ def getTimestamp() {
classes {
dependsOn createProperties
}

configurations {
testArtifacts.extendsFrom testRuntime
}

artifacts {
testArtifacts testJar
}
8 changes: 8 additions & 0 deletions crypto/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,11 @@ dependencies {
"com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
"org.slf4j:slf4j-api:$slf4jVersion"
}

configurations {
testArtifacts.extendsFrom testRuntime
}

artifacts {
testArtifacts testJar
}
2 changes: 1 addition & 1 deletion geth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ description 'Geth JSON-RPC API'

dependencies {
compile project(':core')
testCompile project(path: ':core', configuration: 'archives')
testCompile project(path: ':core', configuration: 'testArtifacts')
}
2 changes: 1 addition & 1 deletion parity/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ description 'Parity JSON-RPC API'

dependencies {
compile project(':core')
testCompile project(path: ':core', configuration: 'archives'),
testCompile project(path: ':core', configuration: 'testArtifacts'),
"nl.jqno.equalsverifier:equalsverifier:$equalsverifierVersion"
}