Changes for Jan 2024 release (#1994)

Changes for Jan 2024 release --------- Co-authored-by: Sowmya Malayanur <69237821+somalaya@users.noreply.github.com>
AzureAD · Jan 8, 2024 · 70efb25 · 70efb25
1 parent bf8a944
commit 70efb25
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 15 deletions.
diff --git a/changelog b/changelog
@@ -1,6 +1,8 @@
 MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
-vNext
+
+Version 5.0.0
 ----------
+- [MINOR] Update common @17.0.0
 - [MINOR] Add consumer rule to remove native auth from msal by default (#1986)
 - [MAJOR] Consuming Credential Manager from common (brings minCompileSdk 34) (#1987)
 

diff --git a/common b/common
diff --git a/msal/build.gradle b/msal/build.gradle
@@ -188,7 +188,7 @@ task sourcesJar(type: Jar) {
 
 // In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline.
 // In release/*, we change these to specific versions being consumed.
-String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "1.0.+"
+String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "17.0.0"
 
 dependencies {
     //Please leave this in... desugaring is currently disabled by default; however it's required for running some tests
@@ -256,7 +256,7 @@ dependencies {
     }
 
     testLocalImplementation(testFixtures(project(":common4j")))
-    String common4jVersion = project.hasProperty("distCommon4jVersion") ? project.distCommon4jVersion : "1.0.+"
+    String common4jVersion = project.hasProperty("distCommon4jVersion") ? project.distCommon4jVersion : "14.0.0"
     testDistImplementation(testFixtures("com.microsoft.identity:common4j:${common4jVersion}"))
 
     implementation platform("io.opentelemetry:opentelemetry-bom:$rootProject.ext.openTelemetryVersion")

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=4.10.0
+versionName=5.0.0
 versionCode=0
diff --git a/msalautomationapp/build.gradle b/msalautomationapp/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
-def msalVersion = "4.+"
+def msalVersion = "5.+"
 
 if (project.hasProperty("distMsalVersion")) {
     msalVersion = distMsalVersion

diff --git a/...crosoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561652.java b/...crosoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561652.java
@@ -104,14 +104,7 @@ public void decodeSSOTokenAndVerifyNonce(@NonNull final String ssoToken,
                     .append('\n');
         }
         final String decodedToken = sb.toString();
-        if (decodedToken.contains("request_nonce")) {
-            final String[] str = decodedToken.split("request_nonce => ");
-            if (str.length > 1) {
-                Assert.assertEquals(str[1].trim(), nonce);
-            } else {
-                Assert.fail("decoded token does not contain correct nonce");
-            }
-        } else {
+        if (!decodedToken.contains(nonce)) {
             Assert.fail("decoded token does not contain correct nonce");
         }
     }

diff --git a/testapps/testapp/build.gradle b/testapps/testapp/build.gradle
@@ -25,7 +25,7 @@
 
 apply plugin: 'com.android.application'
 
-def msalVersion = "4.+"
+def msalVersion = "5.+"
 
 if (project.hasProperty("distMsalVersion")) {
     msalVersion = distMsalVersion