Skip to content

Commit 49f1af2

Browse files
author
Antonis
committed
Fixed #805: Change RCLogger so it can be used in Local unit tests. Fixed build issue with app_name in SDK. Introduced new icons to separate community vs premium in our devices. Various cleanups
2 parents b99a95b + d3baa97 commit 49f1af2

File tree

52 files changed

+116
-712
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+116
-712
lines changed

Examples/restcomm-olympus/app/app.iml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1818
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1919
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/premiumDebug/res" />
2121
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2222
</configuration>
2323
</facet>
@@ -141,6 +141,7 @@
141141
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
142142
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
143143
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
144+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
144145
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
145146
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
146147
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
@@ -179,11 +180,11 @@
179180
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
180181
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.8.0" level="project" />
181182
<orderEntry type="library" name="com.google.firebase:firebase-common-license-11.8.0" level="project" />
182-
<orderEntry type="library" name="com.google.firebase:firebase-core-11.6.2" level="project" />
183+
<orderEntry type="library" name="com.google.firebase:firebase-core-11.8.0" level="project" />
183184
<orderEntry type="library" scope="TEST" name="net.sf.kxml:kxml2:2.3.0@jar" level="project" />
184185
<orderEntry type="library" name="com.android.support:transition-26.1.0" level="project" />
185186
<orderEntry type="library" name="com.android.support:design-26.1.0" level="project" />
186-
<orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-11.6.2" level="project" />
187+
<orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-11.8.0" level="project" />
187188
<orderEntry type="library" scope="TEST" name="org.awaitility:awaitility:3.0.0@jar" level="project" />
188189
<orderEntry type="library" name="com.google.firebase:firebase-iid-license-11.8.0" level="project" />
189190
<orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
@@ -193,7 +194,7 @@
193194
<orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-core-3.0.0" level="project" />
194195
<orderEntry type="library" scope="TEST" name="cz.msebera.android:httpclient:4.3.6@jar" level="project" />
195196
<orderEntry type="library" name="com.android.support:support-core-utils-26.1.0" level="project" />
196-
<orderEntry type="library" name="com.google.firebase:firebase-analytics-11.6.2" level="project" />
197+
<orderEntry type="library" name="com.google.firebase:firebase-analytics-11.8.0" level="project" />
197198
<orderEntry type="library" name="org.webrtc:google-webrtc-1.0.21217" level="project" />
198199
<orderEntry type="library" scope="TEST" name="com.android.support.test:rules-1.0.1" level="project" />
199200
<orderEntry type="library" name="dnsjava:dnsjava:2.1.7@jar" level="project" />
@@ -213,8 +214,8 @@
213214
<orderEntry type="library" name="javax.sip:android-jain-sip-ri:1.2.293@jar" level="project" />
214215
<orderEntry type="library" name="org.restcomm.commons:commons-congestion:2.0.147@jar" level="project" />
215216
<orderEntry type="library" name="javolution:javolution:5.5.1@jar" level="project" />
216-
<orderEntry type="library" name="com.google.firebase:firebase-analytics-license-11.6.2" level="project" />
217-
<orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-license-11.6.2" level="project" />
217+
<orderEntry type="library" name="com.google.firebase:firebase-analytics-license-11.8.0" level="project" />
218+
<orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-license-11.8.0" level="project" />
218219
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.8.0" level="project" />
219220
<orderEntry type="module" module-name="restcomm.android.sdk" />
220221
</component>

Examples/restcomm-olympus/app/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ android {
117117

118118
// Set specific application name as a resource, so that it's clear in the device what flavor a user is looking at
119119
resValue "string", "app_name", "Restcomm WebRTC Demo Community"
120-
//buildConfigField "boolean", "ENABLE_TEST_FAIRY_RUNTIME", "false"
121-
//buildConfigField "String", "TESTFAIRY_APP_TOKEN", TESTFAIRY_APP_TOKEN
122120

123121
// ICE_USERNAME, ICE_PASSWORD, ICE_DOMAIN &ICE_URL are defined in project gradle.properties for community builds, but also overriden
124122
// by gradle properties passed from command line (i.e. $ gradlew ... -PICE_DOMAIN=...) for Telestax builds from our
@@ -141,8 +139,6 @@ android {
141139

142140
// Set specific application name as a resource, so that it's clear in the device what flavor a user is looking at
143141
resValue "string", "app_name", "Restcomm WebRTC Demo Premium"
144-
//buildConfigField "boolean", "ENABLE_TEST_FAIRY_RUNTIME", "false"
145-
//buildConfigField "String", "TESTFAIRY_APP_TOKEN", TESTFAIRY_APP_TOKEN
146142

147143
// ICE_USERNAME, ICE_PASSWORD, ICE_DOMAIN &ICE_URL are defined in project gradle.properties for community builds, but also overriden
148144
// by gradle properties passed from command line (i.e. $ gradlew ... -PICE_DOMAIN=...) for Telestax builds from our
@@ -241,8 +237,10 @@ dependencies {
241237
//compile 'testfairy:testfairy-android-sdk:1.4.5'
242238
//compile 'net.hockeyapp.android:HockeySDK:4.1.1'
243239
////compile files('./libs/testfairy-android-sdk-1.4.6-unlimited-events.jar')
244-
compile 'com.google.firebase:firebase-messaging:11.6.2'
240+
compile 'com.google.firebase:firebase-messaging:11.8.0'
241+
245242
// AndroidJUnitRunner and JUnit Rules
243+
// Remember that we need to prefix instrumented tests with 'android'
246244
androidTestCompile 'com.android.support.test:runner:1.0.1'
247245
androidTestCompile 'com.android.support.test:rules:1.0.1'
248246
androidTestUtil 'com.android.support.test:orchestrator:1.0.1'
@@ -256,6 +254,7 @@ dependencies {
256254
androidTestCompile 'com.squareup.assertj:assertj-android:1.1.1', {
257255
exclude group: 'com.android.support', module: 'support-annotations'
258256
}
257+
259258
compile 'com.android.support:multidex:1.0.2'
260259
}
261260

3.45 KB
2.42 KB
4.5 KB
6.88 KB
4.16 KB
File renamed without changes.
2.57 KB
1.92 KB

0 commit comments

Comments
 (0)