Merge pull request #577 from Microsoft/develop

Version 1.1.0

Author: jaeklim

.gitignore

@@ -50,3 +50,8 @@ google-services.json
 # Localization
 localization/*.zip
 localization/unzip/
+
+# VS Code + Java extension follows Eclipse conventions
+.settings
+.project
+.classpath

README.md

@@ -1,4 +1,3 @@
-[![Build Status](https://www.bitrise.io/app/78891228f9c6e6dc.svg?token=KQ6kVAci490XBjulCcQuGQ&branch=develop)](https://www.bitrise.io/app/78891228f9c6e6dc)
 [![codecov](https://codecov.io/gh/Microsoft/AppCenter-SDK-Android/branch/develop/graph/badge.svg?token=YwMZRPnYK3)](https://codecov.io/gh/Microsoft/AppCenter-SDK-Android)
 [![GitHub Release](https://img.shields.io/github/release/Microsoft/AppCenter-SDK-Android.svg)](https://github.com/Microsoft/AppCenter-SDK-Android/releases/latest)
 [![Bintray](https://api.bintray.com/packages/vsappcenter/appcenter/appcenter/images/download.svg)](https://bintray.com/vsappcenter/appcenter)
@@ -26,8 +25,6 @@ It is super easy to use App Center. Have a look at our [get started documentatio
 
 We are looking forward to your contributions via pull requests.
 
-Please note that the test app named **Sasquatch** requires a **google-services.json** to compile. This file is git ignored as it contains secrets. You have to provide your own **google-services.json** file in the **app/sasquatch** folder if you want to build. This requires having your own Firebase Project.
-
 ### 2.1 Code of Conduct
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

apps/appcenter-post-clone.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+echo "Executing post clone script in `pwd`"
+echo $GOOGLE_SERVICES_JSON | base64 -D > $APPCENTER_SOURCE_DIRECTORY/apps/sasquatch/google-services.json
+echo "dimension.dependency=$DIMENSION_DEPENDENCY" >> $APPCENTER_SOURCE_DIRECTORY/local.properties

apps/build.gradle

@@ -31,9 +31,14 @@ subprojects {
 
 // Task to copy a specific APK from sub projects to current project, for App Center build to find it.
 def copyApkToProjectBuildTask(buildType) {
+    Properties properties = new Properties()
+    File file = rootProject.file('local.properties')
+    if (file.exists()) {
+        properties.load(file.newDataInputStream())
+    }
+    def dependency = properties.get("dimension.dependency", "jcenter")
     subprojects.each { project ->
-        def dependency = "jcenter"
-        def apkPath = "${project.buildDir}/outputs/apk/${dependency}Dependency/${buildType}/${project.name}-${dependency}Dependency-${buildType}"
+        def apkPath = "${project.buildDir}/outputs/apk/${dependency}DependencyVanilla/${buildType}/${project.name}-${dependency}Dependency-vanilla-${buildType}"
         if ("release".equals(buildType)) {
             apkPath += "-unsigned"
         }
@@ -58,4 +63,8 @@ task assembleRelease() {
 }
 
 // Empty task with task dependencies.
-task assemble(dependsOn: [assembleDebug, assembleRelease]) {}
+task assemble(dependsOn: [assembleDebug, assembleRelease]) {}
+
+task clean() {
+    delete project.buildDir
+}

apps/mobile-center-post-clone.sh

@@ -6,7 +6,7 @@ evaluationDependsOn(':apps')
 
 android {
 
-    flavorDimensions "dependency"
+    flavorDimensions "dependency", "pushLibrary"
 
     productFlavors {
         projectDependency {
@@ -17,6 +17,20 @@ android {
             dimension "dependency"
             applicationIdSuffix ".jcenter"
         }
+        vanilla {
+            dimension "pushLibrary"
+        }
+        firebase {
+            dimension "pushLibrary"
+        }
+    }
+
+    /* TODO remove that filter once we update the jcenter demo to include the no firebase push sdk. */
+    variantFilter { variant ->
+        def names = variant.flavors*.name
+        if (names.contains("jcenterDependency") && names.contains("vanilla")) {
+            setIgnore(true)
+        }
     }
 
     buildTypes {
@@ -30,28 +44,45 @@ android {
 
 repositories {
     maven {
-        url  "https://dl.bintray.com/vsappcenter/appcenter-snapshot"
+        url "https://dl.bintray.com/vsappcenter/appcenter-snapshot"
     }
 }
 
 dependencies {
+    implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
+    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+
+    projectDependencyImplementation project(':sdk:appcenter-analytics')
+    projectDependencyImplementation project(':sdk:appcenter-crashes')
+    projectDependencyImplementation project(':sdk:appcenter-distribute')
+    projectDependencyImplementation project(':sdk:appcenter-push')
+    projectDependencyImplementation project(':sdk:appcenter-rum')
+
     def version = "1.0.0"
-    compile "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
-    compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-    projectDependencyCompile project(':sdk:appcenter-analytics')
-    projectDependencyCompile project(':sdk:appcenter-crashes')
-    projectDependencyCompile project(':sdk:appcenter-distribute')
-    projectDependencyCompile project(':sdk:appcenter-push')
-    projectDependencyCompile project(':sdk:appcenter-rum')
-    jcenterDependencyCompile "com.microsoft.appcenter:appcenter-analytics:${version}"
-    jcenterDependencyCompile "com.microsoft.appcenter:appcenter-crashes:${version}"
-    jcenterDependencyCompile "com.microsoft.appcenter:appcenter-distribute:${version}"
-    jcenterDependencyCompile "com.microsoft.appcenter:appcenter-push:${version}"
+    //noinspection GradleDependency
+    jcenterDependencyImplementation "com.microsoft.appcenter:appcenter-analytics:${version}"
+    //noinspection GradleDependency
+    jcenterDependencyImplementation "com.microsoft.appcenter:appcenter-crashes:${version}"
+    //noinspection GradleDependency
+    jcenterDependencyImplementation "com.microsoft.appcenter:appcenter-distribute:${version}"
+    //noinspection GradleDependency
+    jcenterDependencyImplementation "com.microsoft.appcenter:appcenter-push:${version}"
+
+    firebaseCompile "com.google.firebase:firebase-core:${rootProject.ext.firebaseLibVersion}"
+    firebaseCompile "com.google.firebase:firebase-messaging:${rootProject.ext.firebaseLibVersion}"
 
     /* Force usage this version of support annotations to avoid conflict. */
-    androidTestCompile "com.android.support:support-annotations:${rootProject.ext.supportLibVersion}"
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
-    compile 'com.android.support.test.espresso:espresso-idling-resource:3.0.1'
+    androidTestImplementation "com.android.support:support-annotations:${rootProject.ext.supportLibVersion}"
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    implementation 'com.android.support.test.espresso:espresso-idling-resource:3.0.1'
 }
 
-apply plugin: 'com.google.gms.google-services'
+/*
+ * This will also bypass google-services.json if executing assembleDebug wildcard task.
+ * This is needed to build from App Center build as we don't commit google-services.json and
+ * App Center build cannot detect our gradle tasks so we make it execute assembleDebug with a
+ * work around. We are interested in only a vanilla build variant (no Firebase) for such builds.
+ */
+if (getGradle().getStartParameter().getTaskRequests().toString().contains("Firebase")) {
+    apply plugin: 'com.google.gms.google-services'
+}

apps/sasquatch/build.gradle

@@ -6,6 +6,7 @@
 
 import com.microsoft.appcenter.Constants;
 import com.microsoft.appcenter.sasquatch.R;
+import com.microsoft.appcenter.sasquatch.listeners.SasquatchAnalyticsListener;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -78,8 +79,8 @@ public void sendPageTest() throws InterruptedException {
     }
 
     private void waitAnalytics() {
-        Espresso.registerIdlingResources(MainActivity.analyticsIdlingResource);
+        Espresso.registerIdlingResources(SasquatchAnalyticsListener.analyticsIdlingResource);
         onView(isRoot()).perform(waitFor(CHECK_DELAY));
-        Espresso.unregisterIdlingResources(MainActivity.analyticsIdlingResource);
+        Espresso.unregisterIdlingResources(SasquatchAnalyticsListener.analyticsIdlingResource);
     }
 }

apps/sasquatch/src/androidTest/java/com/microsoft/appcenter/sasquatch/activities/AnalyticsTest.java

@@ -12,13 +12,14 @@
 import android.support.v4.app.ActivityCompat;
 import android.view.View;
 
-import com.microsoft.appcenter.Constants;
 import com.microsoft.appcenter.AppCenter;
+import com.microsoft.appcenter.Constants;
 import com.microsoft.appcenter.crashes.Crashes;
 import com.microsoft.appcenter.crashes.CrashesPrivateHelper;
 import com.microsoft.appcenter.crashes.model.ErrorReport;
 import com.microsoft.appcenter.crashes.utils.ErrorLogHelper;
 import com.microsoft.appcenter.sasquatch.R;
+import com.microsoft.appcenter.sasquatch.listeners.SasquatchCrashesListener;
 import com.microsoft.appcenter.utils.storage.StorageHelper;
 
 import org.hamcrest.Description;
@@ -96,18 +97,23 @@ public void setUp() throws Exception {
             assertTrue(logFile.delete());
         }
 
+        /* Clear listeners. */
+        MainActivity.sAnalyticsListener = null;
+        MainActivity.sCrashesListener = null;
+        MainActivity.sPushListener = null;
+
         /* Launch main activity and go to setting page. Required to properly initialize. */
         mActivityTestRule.launchActivity(new Intent());
 
         /* Register IdlingResource */
-        Espresso.registerIdlingResources(MainActivity.crashesIdlingResource);
+        Espresso.registerIdlingResources(SasquatchCrashesListener.crashesIdlingResource);
     }
 
     @After
     public final void tearDown() {
 
         /* Unregister IdlingResource */
-        Espresso.unregisterIdlingResources(MainActivity.crashesIdlingResource);
+        Espresso.unregisterIdlingResources(SasquatchCrashesListener.crashesIdlingResource);
     }
 
     @Test
@@ -215,9 +221,18 @@ public void handle(Throwable error, Matcher<View> viewMatcher) {
         }
 
         private void relaunchActivity() {
+
+            /* Destroy old instances. */
             ActivityCompat.finishAffinity(mActivityTestRule.getActivity());
             unsetInstance(AppCenter.class);
             unsetInstance(Crashes.class);
+
+            /* Clear listeners. */
+            MainActivity.sAnalyticsListener = null;
+            MainActivity.sCrashesListener = null;
+            MainActivity.sPushListener = null;
+
+            /* Launch activity again. */
             Intent intent = new Intent();
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
             mActivityTestRule.launchActivity(intent);

apps/sasquatch/src/androidTest/java/com/microsoft/appcenter/sasquatch/activities/CrashesTest.java

@@ -4,6 +4,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
@@ -14,7 +15,6 @@
 import com.microsoft.appcenter.ingestion.models.Device;
 import com.microsoft.appcenter.sasquatch.R;
 import com.microsoft.appcenter.utils.DeviceInfoHelper;
-import com.microsoft.appcenter.utils.AppCenterLog;
 import com.microsoft.appcenter.utils.NetworkStateHelper;
 
 import java.lang.reflect.Method;
@@ -26,7 +26,7 @@ public class DeviceInfoActivity extends AppCompatActivity implements NetworkStat
     /**
      * TAG used in logging.
      */
-    private static final String TAG = "DeviceInfoActivity";
+    private static final String LOG_TAG = "DeviceInfoActivity";
 
     private static final String[] METHOD_BLACK_LIST = {"getClass"};
 
@@ -108,7 +108,7 @@ private boolean isInBlackList(String name) {
     @Override
     public void onNetworkStateUpdated(boolean connected) {
         String message = "Network " + (connected ? "up" : "down");
-        AppCenterLog.verbose(TAG, message);
+        Log.v(LOG_TAG, message);
         Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
     }