Skip to content

Commit b99a95b

Browse files
author
Antonis
committed
Working on #805: Change RCLogger so it can be used in Local unit tests
1 parent 05b8daf commit b99a95b

File tree

3 files changed

+623
-19
lines changed

3 files changed

+623
-19
lines changed

Examples/restcomm-olympus/app/app.iml

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@
127127
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
128128
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
129129
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
130-
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
131-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/.DS_Store" />
132130
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
133131
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
134132
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
@@ -152,7 +150,7 @@
152150
<orderEntry type="library" name="com.android.support:multidex-1.0.2" level="project" />
153151
<orderEntry type="library" name="com.android.support:support-media-compat-26.1.0" level="project" />
154152
<orderEntry type="library" name="com.android.support:recyclerview-v7-26.1.0" level="project" />
155-
<orderEntry type="library" name="com.google.firebase:firebase-iid-11.6.2" level="project" />
153+
<orderEntry type="library" name="com.google.firebase:firebase-iid-11.8.0" level="project" />
156154
<orderEntry type="library" name="android.arch.lifecycle:common:1.0.0@jar" level="project" />
157155
<orderEntry type="library" name="org.slf4j:slf4j-api:1.6.1@jar" level="project" />
158156
<orderEntry type="library" scope="TEST" name="org.assertj:assertj-core:1.7.1@jar" level="project" />
@@ -161,7 +159,7 @@
161159
<orderEntry type="library" name="android.arch.lifecycle:runtime-1.0.0" level="project" />
162160
<orderEntry type="library" name="testfairy:testfairy-android-sdk-1.5.15" level="project" />
163161
<orderEntry type="library" name="com.android.support:appcompat-v7-26.1.0" level="project" />
164-
<orderEntry type="library" name="com.google.android.gms:play-services-basement-license-11.6.2" level="project" />
162+
<orderEntry type="library" name="com.google.android.gms:play-services-basement-license-11.8.0" level="project" />
165163
<orderEntry type="library" name="com.android.support:support-annotations:26.1.0@jar" level="project" />
166164
<orderEntry type="library" name="com.madgag.spongycastle:prov:1.54.0.0@jar" level="project" />
167165
<orderEntry type="library" name="com.android.support:support-core-ui-26.1.0" level="project" />
@@ -173,21 +171,21 @@
173171
<orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-idling-resource-3.0.0" level="project" />
174172
<orderEntry type="library" name="com.android.support:support-compat-26.1.0" level="project" />
175173
<orderEntry type="library" name="com.madgag.spongycastle:pkix:1.54.0.0@jar" level="project" />
176-
<orderEntry type="library" name="com.google.android.gms:play-services-basement-11.6.2" level="project" />
174+
<orderEntry type="library" name="com.google.android.gms:play-services-basement-11.8.0" level="project" />
175+
<orderEntry type="library" name="com.google.firebase:firebase-messaging-license-11.8.0" level="project" />
177176
<orderEntry type="library" scope="TEST" name="com.android.support.test.uiautomator:uiautomator-v18-2.1.3" level="project" />
178-
<orderEntry type="library" name="com.google.firebase:firebase-messaging-license-11.6.2" level="project" />
179177
<orderEntry type="library" name="android.arch.core:common:1.0.0@jar" level="project" />
180-
<orderEntry type="library" name="com.google.firebase:firebase-common-11.6.2" level="project" />
178+
<orderEntry type="library" name="com.google.firebase:firebase-common-11.8.0" level="project" />
181179
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
182-
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.6.2" level="project" />
183-
<orderEntry type="library" name="com.google.firebase:firebase-common-license-11.6.2" level="project" />
180+
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.8.0" level="project" />
181+
<orderEntry type="library" name="com.google.firebase:firebase-common-license-11.8.0" level="project" />
184182
<orderEntry type="library" name="com.google.firebase:firebase-core-11.6.2" level="project" />
185183
<orderEntry type="library" scope="TEST" name="net.sf.kxml:kxml2:2.3.0@jar" level="project" />
186184
<orderEntry type="library" name="com.android.support:transition-26.1.0" level="project" />
187185
<orderEntry type="library" name="com.android.support:design-26.1.0" level="project" />
188186
<orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-11.6.2" level="project" />
189187
<orderEntry type="library" scope="TEST" name="org.awaitility:awaitility:3.0.0@jar" level="project" />
190-
<orderEntry type="library" name="com.google.firebase:firebase-iid-license-11.6.2" level="project" />
188+
<orderEntry type="library" name="com.google.firebase:firebase-iid-license-11.8.0" level="project" />
191189
<orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
192190
<orderEntry type="library" name="com.android.support:support-fragment-26.1.0" level="project" />
193191
<orderEntry type="library" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
@@ -206,8 +204,8 @@
206204
<orderEntry type="library" name="org.apache.commons:commons-lang3:3.1@jar" level="project" />
207205
<orderEntry type="library" name="log4j:log4j:1.2.17@jar" level="project" />
208206
<orderEntry type="library" name="org.mobicents.javax.sip:android-jain-sip-ext:1.3.33@jar" level="project" />
209-
<orderEntry type="library" name="com.google.firebase:firebase-messaging-11.6.2" level="project" />
210207
<orderEntry type="library" name="com.android.support:support-v4-26.1.0" level="project" />
208+
<orderEntry type="library" name="com.google.firebase:firebase-messaging-11.8.0" level="project" />
211209
<orderEntry type="library" name="org.mvel:mvel2:2.1.8.Final@jar" level="project" />
212210
<orderEntry type="library" name="com.android.support:animated-vector-drawable-26.1.0" level="project" />
213211
<orderEntry type="library" name="org.squirrelframework:squirrel-foundation:0.3.8@jar" level="project" />
@@ -217,13 +215,7 @@
217215
<orderEntry type="library" name="javolution:javolution:5.5.1@jar" level="project" />
218216
<orderEntry type="library" name="com.google.firebase:firebase-analytics-license-11.6.2" level="project" />
219217
<orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-license-11.6.2" level="project" />
220-
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.6.2" level="project" />
221-
<orderEntry type="module" module-name="restcomm.android.sdk" />
222-
<orderEntry type="module" module-name="restcomm.android.sdk" />
223-
<orderEntry type="module" module-name="restcomm.android.sdk" />
224-
<orderEntry type="module" module-name="restcomm.android.sdk" />
225-
<orderEntry type="module" module-name="restcomm.android.sdk" />
226-
<orderEntry type="module" module-name="restcomm.android.sdk" />
218+
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.8.0" level="project" />
227219
<orderEntry type="module" module-name="restcomm.android.sdk" />
228220
</component>
229221
</module>

restcomm.android.sdk/build.gradle

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ android {
6464
sourceCompatibility JavaVersion.VERSION_1_8
6565
targetCompatibility JavaVersion.VERSION_1_8
6666
}
67+
testOptions {
68+
unitTests {
69+
includeAndroidResources = true
70+
}
71+
}
6772
}
6873

6974
gradle.taskGraph.whenReady { taskGraph ->
@@ -123,8 +128,12 @@ dependencies {
123128
compile 'dnsjava:dnsjava:2.1.7'
124129
compile 'org.mobicents.javax.sip:android-jain-sip-ext:1.3.33'
125130
//compile 'org.mobicents.javax.sip:android-jain-sip-ext:1.3.0-SNAPSHOT'
126-
compile 'com.google.firebase:firebase-messaging:11.6.2'
131+
compile 'com.google.firebase:firebase-messaging:11.8.0'
127132
compile 'com.firebase:firebase-jobdispatcher:0.6.0'
133+
134+
testCompile "org.assertj:assertj-core:1.7.1"
135+
testImplementation "org.robolectric:robolectric:3.6.1"
136+
androidTestCompile 'junit:junit:4.12'
128137
}
129138

130139

0 commit comments

Comments
 (0)