Hotfix Release 1.5.4 - Merge to Master (#1083)

* Update submodule to [email protected] * Update version to 1.5.4 * Update gradle deps to 2.0.12 * Update changelog
AzureAD · Jul 2, 2020 · 0924464 · 0924464
1 parent 46991b7
commit 0924464
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/changelog b/changelog
@@ -1,11 +1,15 @@
 MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
 
+Version 1.5.4
+-----------
+- Fix for NPE if sub_error is null.
+- Picks up [email protected]
+
 Version 1.5.3
 -----------
 - Changes to delete RT on bad_token suberror.
 - Picks up [email protected]
 
-
 Version 1.5.2
 ------------
 - Broker Content Provider Changes

diff --git a/common b/common
diff --git a/msal/build.gradle b/msal/build.gradle
@@ -148,9 +148,9 @@ dependencies {
         transitive = false
     }
 
-    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '2.0.11', changing: true)
+    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '2.0.12', changing: true)
 
-    distApi("com.microsoft.identity:common:2.0.11") {
+    distApi("com.microsoft.identity:common:2.0.12") {
         transitive = false
     }
 }

diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties
@@ -1,3 +1,3 @@
 #Wed Aug 01 15:24:11 PDT 2018
-versionName=1.5.3
+versionName=1.5.4
 versionCode=0
+4 −1		changelog.txt
+11 −8		common/src/main/java/com/microsoft/identity/common/internal/controllers/BaseController.java
+1 −1		common/src/main/java/com/microsoft/identity/common/internal/platform/Device.java
+1 −1		common/versioning/version.properties