Merge amgusain/release/5.8.0 to release/5.8.0 (#2216)

iamgusain · web-flow · commit 47a089d373e2 · 2024-11-12T15:32:56.000-05:00
diff --git a/changelog b/changelog
@@ -1,7 +1,8 @@
 MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
 
-vNext
+Version 5.8.0
 ----------
+-[PATCH] Update common @18.2.0
 -[MINOR] Migrate Base64 away from Msebera (#2210)
 
 Version 5.7.0
diff --git a/common b/common
@@ -1 +1 @@
-Subproject commit fc41b4c4e67752f3a0d520c69f8598070f2ae38a
+Subproject commit de57369dd6d1210fbe9ec38caaf2b694c623112c
diff --git a/msal/build.gradle b/msal/build.gradle
@@ -188,12 +188,12 @@ 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.
-def commonVersion = "1.0.+"
+def commonVersion = "18.2.0"
 if (project.hasProperty("distCommonVersion")) {
     commonVersion = project.distCommonVersion
 }
 // Used for testfixtures
-def common4jVersion = "1.0.+"
+def common4jVersion = "15.2.0"
 if (project.hasProperty("distCommon4jVersion")) {
     distCommon4jVersion = project.distCommon4jVersion
 }
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=5.7.0
+versionName=5.8.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 = "5.7.0"
+def msalVersion = "5.8.0"
 
 if (project.hasProperty("distMsalVersion")) {
     msalVersion = distMsalVersion
diff --git a/testapps/testapp/build.gradle b/testapps/testapp/build.gradle
@@ -29,7 +29,7 @@ apply plugin: 'kotlin-android'
 
 apply plugin: 'kotlin-android-extensions'
 
-def msalVersion = "5.7.0"
+def msalVersion = "5.8.0"
 
 if (project.hasProperty("distMsalVersion")) {
     msalVersion = distMsalVersion

Original file line number	Diff line number	Diff line change
`@@ -188,12 +188,12 @@ task sourcesJar(type: Jar) {`
`188`	`188`
`189`	`189`	`// In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline.`
`190`	`190`	`// In release/*, we change these to specific versions being consumed.`
`191`		`-def commonVersion = "1.0.+"`
	`191`	`+def commonVersion = "18.2.0"`
`192`	`192`	`if (project.hasProperty("distCommonVersion")) {`
`193`	`193`	`commonVersion = project.distCommonVersion`
`194`	`194`	`}`
`195`	`195`	`// Used for testfixtures`
`196`		`-def common4jVersion = "1.0.+"`
	`196`	`+def common4jVersion = "15.2.0"`
`197`	`197`	`if (project.hasProperty("distCommon4jVersion")) {`
`198`	`198`	`distCommon4jVersion = project.distCommon4jVersion`
`199`	`199`	`}`