Merge pull request #1514 from microsoft/develop

Version 4.1.1

Author: Anastasia Senyushina

CHANGELOG.md

@@ -1,5 +1,24 @@
 # App Center SDK for Android Change Log
 
+## Version 4.1.1
+
+### App Center Distribute Play
+
+* **[Fix]** Fix `onNoReleaseAvailable` callback signature.
+
+### App Center Distribute
+
+* **[Fix]** Fix `NullPointerException` occurring when settings dialog was intended to be shown, but there is no foreground activity at that moment.
+* **[Fix]** Fix a crash when download manager application was disabled.
+* **[Fix]** Fix showing the title in the push notification while downloading a new release.
+
+### App Center Crashes
+
+* **[Fix]** Fix formatting of stack trace in the `ErrorReport`.
+* **[Fix]** Fix setting `userId` value in NDK crashes before sending.
+
+___
+
 ## Version 4.1.0
 
 ### App Center Crashes

apps/appcenter-post-clone.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 echo "Executing post clone script in `pwd`"
 echo "dimension.dependency=$DIMENSION_DEPENDENCY" >> $APPCENTER_SOURCE_DIRECTORY/local.properties
-../scripts/set-ndk-version.sh
+../scripts/set-ndk-version.sh
+cd $APPCENTER_SOURCE_DIRECTORY && ./scripts/put-azure-credentials.sh $AZURE_USERNAME $AZURE_PASSWORD

apps/build.gradle

@@ -41,7 +41,7 @@ def copyApkToProjectBuildTask(buildType) {
     if (file.exists()) {
         properties.load(file.newDataInputStream())
     }
-    def defaultDependency = "jcenter"
+    def defaultDependency = "mavenCentral"
     def dependency = properties.get("dimension.dependency", defaultDependency)
     if (dependency.isEmpty()) {
         dependency = defaultDependency

apps/sasquatch/build.gradle

@@ -27,9 +27,9 @@ android {
             dimension "dependency"
             applicationIdSuffix ".project"
         }
-        jcenterDependency {
+        mavenCentralDependency {
             dimension "dependency"
-            applicationIdSuffix ".jcenter"
+            applicationIdSuffix ".mavenCentral"
         }
         appCenter {
             dimension "distribute"
@@ -55,8 +55,28 @@ android {
 }
 
 repositories {
+
+    // Load credentials from local.properties file.
+    File propertiesFile = project.rootProject.file('local.properties')
+    def AZURE_USERNAME = null
+    def AZURE_PASSWORD = null
+
+    // Check that file exist.
+    if (propertiesFile.exists()) {
+        Properties properties = new Properties()
+        properties.load(propertiesFile.newDataInputStream())
+
+        // Get properties. If properties aren't exist it returns null.
+        AZURE_USERNAME = properties.getProperty('AZURE_USERNAME')
+        AZURE_PASSWORD = properties.getProperty('AZURE_PASSWORD')
+    }
+
     maven {
-        url "https://dl.bintray.com/vsappcenter/appcenter-snapshot"
+        credentials {
+            username = AZURE_USERNAME
+            password = AZURE_PASSWORD
+        }
+        url "https://msmobilecenter.pkgs.visualstudio.com/_packaging/AppCenter/maven/v1/"
     }
 }
 
@@ -70,16 +90,16 @@ dependencies {
     projectDependencyImplementation project(':sdk:appcenter-crashes')
 
     def appCenterSdkVersion = "4.1.0"
-    jcenterDependencyImplementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}"
-    jcenterDependencyImplementation "com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}"
+    mavenCentralDependencyImplementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}"
+    mavenCentralDependencyImplementation "com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}"
 
     def taskRequests = getGradle().getStartParameter().getTaskRequests().toString()
     if (taskRequests.contains("GooglePlay")) {
         projectDependencyImplementation project(':sdk:appcenter-distribute-play')
-        jcenterDependencyImplementation "com.microsoft.appcenter:appcenter-distribute-play:${appCenterSdkVersion}"
+        mavenCentralDependencyImplementation "com.microsoft.appcenter:appcenter-distribute-play:${appCenterSdkVersion}"
     } else {
         projectDependencyImplementation project(':sdk:appcenter-distribute')
-        jcenterDependencyImplementation "com.microsoft.appcenter:appcenter-distribute:${appCenterSdkVersion}"
+        mavenCentralDependencyImplementation "com.microsoft.appcenter:appcenter-distribute:${appCenterSdkVersion}"
     }
 
     androidTestImplementation 'com.android.support.test:rules:1.0.2'

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

@@ -23,6 +23,7 @@
 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.CrashTestHelper;
 import com.microsoft.appcenter.sasquatch.R;
 import com.microsoft.appcenter.sasquatch.listeners.SasquatchCrashesListener;
 import com.microsoft.appcenter.utils.storage.SharedPreferencesManager;
@@ -72,10 +73,10 @@ public class CrashesTest {
     private Context mContext;
 
     private static Matcher<Object> withCrashTitle(@StringRes final int titleId) {
-        return new BoundedMatcher<Object, CrashActivity.Crash>(CrashActivity.Crash.class) {
+        return new BoundedMatcher<Object, CrashTestHelper.Crash>(CrashTestHelper.Crash.class) {
 
             @Override
-            public boolean matchesSafely(CrashActivity.Crash map) {
+            public boolean matchesSafely(CrashTestHelper.Crash map) {
                 return map.title == titleId;
             }
 
@@ -183,7 +184,7 @@ private void crashTest(@StringRes int titleId) throws InterruptedException {
                 new Date().getTime() - errorReport.getAppErrorTime().getTime(),
                 lessThan(10000L));
         assertNotNull(errorReport.getDevice());
-        assertEquals(getStackTraceString(failureHandler.uncaughtException), errorReport.getStackTrace());
+        assertTrue(errorReport.getStackTrace().contains(failureHandler.uncaughtException.getMessage()));
 
         /* Send report. */
         waitFor(onView(withText(R.string.crash_confirmation_dialog_send_button))
@@ -202,7 +203,7 @@ private void crashTest(@StringRes int titleId) throws InterruptedException {
     }
 
     private ViewInteraction onCrash(@StringRes int titleId) {
-        return onData(allOf(instanceOf(CrashActivity.Crash.class), withCrashTitle(titleId)))
+        return onData(allOf(instanceOf(CrashTestHelper.Crash.class), withCrashTitle(titleId)))
                 .perform();
     }
 

build.gradle

@@ -11,15 +11,14 @@ apply from: 'publish.gradle'
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven {
             url 'https://plugins.gradle.org/m2/'
         }
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
     }
@@ -28,7 +27,14 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        jcenter {
+            content {
+
+                // https://youtrack.jetbrains.com/issue/IDEA-261387
+                includeModule("org.jetbrains.trove4j", "trove4j")
+            }
+        }
     }
 
     tasks.withType(JavaCompile) {

publish.gradle

@@ -17,10 +17,12 @@ ext {
         properties.load(file.newDataInputStream())
     }
 
-    bintrayUser = properties.getProperty("bintray.user")
-    bintrayKey = properties.getProperty("bintray.key")
-    bintrayUserOrg = properties.getProperty("bintray.user.org")
-    bintrayRepo = properties.getProperty("bintray.repo")
+    mavenUser = properties.getProperty("maven.user")
+    mavenKey = properties.getProperty("maven.key")
+    mavenRepoUrl = properties.getProperty("maven.repoUrl")
+    mavenSigningKeyId = properties.getProperty("maven.signingKeyId")
+    mavenPublicKeyPassword = properties.getProperty("maven.publicKeyPassword")
+    mavenSecretKeyPath = properties.getProperty("maven.secretKeyPath")
 
     licenseName = 'The MIT License (MIT)'
     licenseSite = 'https://opensource.org/licenses/MIT'
@@ -29,4 +31,4 @@ ext {
     developerId = 'microsoft'
     developerName = 'Microsoft'
     developerEmail = 'appcentersdk@microsoft.com'
-}
+}

scripts/add-snapshot-prefix.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Description: Add a `SNAPSHOT` prefix for `versionName` in `versions.gradle`.
+# Usage: ./scripts/add-snapshot-prefix.sh
+
+# Compute new version
+gradleVersion=`egrep "versionName = '(.*)'" *.gradle | sed -E "s/^.*versionName = '(.*)'.*$/\1/"`
+baseGradleVersion=`echo $gradleVersion | cut -d'-' -f 1`
+newVersion=$baseGradleVersion-"SNAPSHOT"
+
+# Replace version in the file
+sed -E -i '' "s#(versionName = ')(.*)'#\1$newVersion'#" *.gradle
+# Print version on build logs
+grep "versionName = '" *.gradle

scripts/increment-bintray-build-number.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+cat >> local.properties << EOL
+AZURE_USERNAME=${1:-$AZURE_USERNAME}
+AZURE_PASSWORD=${2:-$AZURE_PASSWORD}
+EOL