Merge branch 'master' of https://github.com/RestComm/restcomm-android-sdk

Author: Ognjen Manevski

Examples/restcomm-olympus/app/app.iml

@@ -117,8 +117,6 @@ android {
 
             // Set specific application name as a resource, so that it's clear in the device what flavor a user is looking at
             resValue "string", "app_name", "Restcomm WebRTC Demo Community"
-            //buildConfigField "boolean", "ENABLE_TEST_FAIRY_RUNTIME", "false"
-            //buildConfigField "String", "TESTFAIRY_APP_TOKEN", TESTFAIRY_APP_TOKEN
 
             // ICE_USERNAME, ICE_PASSWORD, ICE_DOMAIN &ICE_URL are defined in project gradle.properties for community builds, but also overriden
             // by gradle properties passed from command line (i.e. $ gradlew ... -PICE_DOMAIN=...) for Telestax builds from our
@@ -141,8 +139,6 @@ android {
 
             // Set specific application name as a resource, so that it's clear in the device what flavor a user is looking at
             resValue "string", "app_name", "Restcomm WebRTC Demo Premium"
-            //buildConfigField "boolean", "ENABLE_TEST_FAIRY_RUNTIME", "false"
-            //buildConfigField "String", "TESTFAIRY_APP_TOKEN", TESTFAIRY_APP_TOKEN
 
             // ICE_USERNAME, ICE_PASSWORD, ICE_DOMAIN &ICE_URL are defined in project gradle.properties for community builds, but also overriden
             // by gradle properties passed from command line (i.e. $ gradlew ... -PICE_DOMAIN=...) for Telestax builds from our
@@ -241,8 +237,10 @@ dependencies {
     //compile 'testfairy:testfairy-android-sdk:1.4.5'
     //compile 'net.hockeyapp.android:HockeySDK:4.1.1'
     ////compile files('./libs/testfairy-android-sdk-1.4.6-unlimited-events.jar')
-    compile 'com.google.firebase:firebase-messaging:11.6.2'
+    compile 'com.google.firebase:firebase-messaging:11.8.0'
+
     // AndroidJUnitRunner and JUnit Rules
+    // Remember that we need to prefix instrumented tests with 'android'
     androidTestCompile 'com.android.support.test:runner:1.0.1'
     androidTestCompile 'com.android.support.test:rules:1.0.1'
     androidTestUtil 'com.android.support.test:orchestrator:1.0.1'
@@ -256,6 +254,7 @@ dependencies {
     androidTestCompile 'com.squareup.assertj:assertj-android:1.1.1', {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
+
     compile 'com.android.support:multidex:1.0.2'
 }