import test dependencies from testArtifacts rather than archives. Rem…

…ove duplicate TempFileProvider class and change to dependency reference.
santtu · Mar 27, 2018 · 267fef9 · 267fef9
1 parent fee3b5d
commit 267fef9
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 35 deletions.
diff --git a/codegen/build.gradle b/codegen/build.gradle
@@ -4,4 +4,5 @@ description 'web3j project code generators'
 dependencies {
     compile project(':core'),
             "com.squareup:javapoet:$javapoetVersion"
+    testCompile project(path: ':core', configuration: 'testArtifacts')
 }
diff --git a/codegen/src/test/java/org/web3j/TempFileProvider.java b/codegen/src/test/java/org/web3j/TempFileProvider.java
diff --git a/console/build.gradle b/console/build.gradle
@@ -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

diff --git a/core/build.gradle b/core/build.gradle
@@ -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"
 }
 
@@ -36,3 +36,11 @@ def getTimestamp() {
 classes {
     dependsOn createProperties
 }
+
+configurations {
+    testArtifacts.extendsFrom testRuntime
+}
+
+artifacts {
+    testArtifacts testJar
+}
diff --git a/crypto/build.gradle b/crypto/build.gradle
@@ -7,3 +7,11 @@ dependencies {
             "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
             "org.slf4j:slf4j-api:$slf4jVersion"
 }
+
+configurations {
+    testArtifacts.extendsFrom testRuntime
+}
+
+artifacts {
+    testArtifacts testJar
+}
diff --git a/geth/build.gradle b/geth/build.gradle
@@ -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')
 }
diff --git a/parity/build.gradle b/parity/build.gradle
@@ -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"
 }