Skip to content

Commit 5c43bd3

Browse files
committed
Fix
1 parent 56bba0a commit 5c43bd3

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

transport/transport-backend-cct/transport-backend-cct.gradle

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ android {
5050
}
5151
testOptions {
5252
unitTests.all {
53-
systemProperty 'robolectric.dependency.repo.url', 'https://repo1.maven.org/maven2'
5453
systemProperty 'javax.net.ssl.trustStore', 'NONE'
5554
}
5655
}
@@ -72,7 +71,18 @@ dependencies {
7271
testImplementation 'junit:junit:4.12'
7372
testImplementation "com.google.truth:truth:$googleTruthVersion"
7473
testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0'
75-
testImplementation 'com.github.tomakehurst:wiremock:2.26.3'
74+
testImplementation 'com.github.tomakehurst:wiremock:2.26.3' {
75+
//Allows us to use the Android version of Apache httpclient instead
76+
exclude group: 'org.apache.httpcomponents', module: 'httpclient'
77+
78+
//Resolves the Duplicate Class Exception
79+
//duplicate entry: org/objectweb/asm/AnnotationVisitor.class
80+
exclude group: 'asm', module: 'asm'
81+
82+
//Fixes Warning conflict with Android's version of org.json
83+
//org.json:json:20090211 is ignored for debugAndroidTest as it may be conflicting with the internal version provided by Android.
84+
exclude group: 'org.json', module: 'json'
85+
}
7686
//Android compatible version of Apache httpclient.
7787
testImplementation 'org.apache.httpcomponents:httpclient-android:4.3.5.1'
7888
testImplementation 'org.robolectric:robolectric:4.3.1'

0 commit comments

Comments
 (0)