Merge pull request #1281 from AzureAD/release/2.0.6

Merge release/2.0.6 to master

Author: rpdome

.github/labeler.yml

@@ -0,0 +1,14 @@
+docs:
+  - docs/**/*
+common:
+  - common/**/*
+msal:
+  - msal/**/*
+test-automation:
+  - msalautomationapp/**/*
+package-inspector:
+  - package-inspector/**/*
+pop-benchmarker:
+  - pop-benchmarker/**/*
+testapps:
+  - testapps/**/*

.github/workflows/label.yml

@@ -0,0 +1,19 @@
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+#
+# To use this workflow, you will need to set up a .github/labeler.yml
+# file with configuration.  For more information, see:
+# https://github.com/actions/labeler/blob/master/README.md
+
+name: Labeler
+on:
+  - pull_request
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v2
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          configuration-path: ".github/labeler.yml"

.travis.yml

@@ -7,7 +7,6 @@ Microsoft Authentication Library (MSAL) for Android
 The MSAL library for Android gives your app the ability to use the [Microsoft Cloud](https://cloud.microsoft.com) by supporting [Microsoft Azure Active Directory](https://azure.microsoft.com/services/active-directory/) and [Microsoft accounts](https://account.microsoft.com) in a converged experience using industry standard OAuth2 and OpenID Connect. The library also supports [Azure AD B2C](https://azure.microsoft.com/services/active-directory-b2c/).
 
 [![Version Badge](https://img.shields.io/maven-central/v/com.microsoft.identity.client/msal.svg)](https://repo1.maven.org/maven2/com/microsoft/identity/client/msal/)
-[![Build Status](https://travis-ci.org/AzureAD/microsoft-authentication-library-for-android.svg?branch=master)](https://travis-ci.org/AzureAD/microsoft-authentication-library-for-android)
 
 
 ## Introduction

README.md

@@ -0,0 +1,43 @@
+name: Instrumented Tests
+trigger:
+- main
+
+
+pool:
+ name: DockerBuildAgents
+
+workspace:
+  clean: all
+steps:
+- checkout: self
+  submodules: true
+- script: |
+    docker --version
+    echo =============================================
+    echo Kill all running containers if existing
+    echo =============================================
+    docker container kill $(docker ps -q)
+    echo =============================================
+    echo Run unit and instrumented inside docker container
+    echo =============================================
+    docker run --privileged --cpus="3" --memory="12g" -v "$PWD":/home/gradle/ -w /home/gradle/ authclient.azurecr.io/samples/dbi-instrumented-api30 sh scripts/run-instrumented-tests.sh
+  displayName: 'Build and test inside docker container'
+- script: |
+    echo =============================================
+    echo Kill all running containers if existing
+    echo =============================================
+    docker container kill $(docker ps -q)
+    echo =============================================
+    echo Cleaning up build output that is owned by docker user rather than agent user
+    echo =============================================
+    docker run --privileged --cpus="3" --memory="12g" -v "$PWD":/home/gradle/ -w /home/gradle/ authclient.azurecr.io/samples/dbi-instrumented-api30 gradle clean
+    echo =============================================
+    echo prune containers to avoid running out of disk space - shutdown containers still exist on disk
+    echo =============================================
+    docker system prune -f
+    echo =============================================
+    echo Dump environment variables for build agent
+    echo =============================================
+    env
+  condition: always()
+  displayName: 'Cleanup'

azure-pipelines.yml

@@ -1,13 +1,14 @@
 MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
 
-v.Next
+Version 2.0.6
 ----------
+- Warn if SAPCA used with B2C. Throw Exception if Multiple Policies are Configured (#1270)
+- Picks up [email protected]
 
 Version 2.0.5
 ----------
 - Fix exception casting issue in CommandDispatcher (common #1121)
 
-
 Version 2.0.4
 ----------
 - Fix syntax error in proguard rules, add usage of proguard to test app #1224

changelog

@@ -8,7 +8,7 @@ MSAL Android divides public client applications into 2 sub-types:
 
 - Single Account Public Client Application - Which is intended to be used by applications that only expect one account to be in use at a time
   - For example: Line of business applications
-- Multiple Account Public Client Applications - Which is intended to be used by applications that expect their user to have multiple accounts and to want to use multiple accounts at the same time.
+- Multiple Account Public Client Applications - Which is intended to be used by B2C applications and any other application that expects a user to have multiple accounts and to want to use multiple accounts at the same time.
   - For example: Email clients
 
 ## Factory Methods
@@ -45,4 +45,3 @@ PublicClientApplication includes a number of static methods for constructing dif
 
 
 
-

common

@@ -2,7 +2,7 @@ ariaTenantTokenProd="b6618d4b5d24466a9d2d0d8cde8cd6e4-ddcec952-23e9-4765-b4fb-f8
 ariaTenantTokenTest="1e8435186fa849b28b1a402fb5074ff1-0b91a9ec-efad-440c-b92c-ac4cb55ba0ff-7490"
 
 android.useAndroidX=true
-android.enableJetifier=false
+android.enableJetifier=true
 
 # https://office.visualstudio.com/Outlook%20Mobile/_wiki/wikis/Outlook-Mobile.wiki/3780/Android-Studio-Gradle-Performance-tips-and-tricks
 org.gradle.parallel=true
@@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -Dkotlin.daemon.jvm.options\="-X
 versionName=1.5.9
 
 # For OneAuth default abiSelection
-abiSelection=x86
+abiSelection=x86_64

docs/publicclientapplication.md

@@ -3,13 +3,16 @@ ext {
     // SDK
     minSdkVersion = 16
     automationAppMinSDKVersion = 21
-    targetSdkVersion = 28
-    compileSdkVersion = 28
+    targetSdkVersion = 30
+    compileSdkVersion = 30
     buildToolsVersion = "28.0.3"
 
     // Plugins
-    gradleVersion = '4.0.1'
+    gradleVersion = '4.1.0'
     androidMavenGradlePluginVersion = "1.4.1"
+    
+    //Java Language Support
+    coreLibraryDesugaringVersion = "1.0.9"
 
     // Libraries
     androidxTestRunnerVersion = "1.2.0"
@@ -21,16 +24,16 @@ ext {
     appCompatVersion = "1.0.2"
     browserVersion = "1.0.0"
     constraintLayoutVersion = "1.1.3"
-    dexmakerMockitoVersion = "1.4"
+    dexmakerMockitoVersion = "2.19.0"
     espressoCoreVersion = "3.1.0"
     gsonVersion = "2.8.5"
     junitVersion = "4.12"
     legacySupportV4Version = "1.0.0"
     localBroadcastManagerVersion = "1.0.0"
     lombokVersion = "1.18.12"
     materialVersion = "1.0.0"
-    mockitoCoreVersion = "2.18.3"
-    mockitoAndroidVersion = "2.18.3"
+    mockitoCoreVersion = "3.6.28"
+    mockitoAndroidVersion = "3.6.28"
     multidexVersion = "2.0.1"
     nimbusVersion = "8.2"
     powerMockVersion = "1.6.6"
@@ -45,7 +48,6 @@ ext {
     adalSnapshot = "3.1.1-SNAPSHOT"
     adalLatest = "3.1.1"
 
-
     //#### The following are TSL version variables - BEGIN
     projectCompileSdkVersion = 29
     projectBuildToolsVersion = '28.0.3'