From f7ddb6eb02035a4e60cd79b11bc7d3daea2b103f Mon Sep 17 00:00:00 2001
From: Shahzaib <37125644+shahzaibj@users.noreply.github.com>
Date: Thu, 8 Aug 2024 12:49:57 -0700
Subject: [PATCH] Changes for August 2024 release setup (#2152)

---
 changelog                          |  6 +++++-
 common                             |  2 +-
 msal/build.gradle                  | 24 ++++++++++++------------
 msal/versioning/version.properties |  2 +-
 msalautomationapp/build.gradle     |  2 +-
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/changelog b/changelog
index 3a94ebf9b..5c7b8e97c 100644
--- a/changelog
+++ b/changelog
@@ -3,10 +3,14 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr
 vNext
 ----------
 
+Version 5.5.0
+---------
+- [MINOR] Fix UserAttributesBuilder being a singleton bug (#2145)
+- [PATCH] Update common @17.7.0
+
 Version 5.4.2
 ---------
 - [PATCH] Update common @17.6.1
-- [MINOR] Fix UserAttributesBuilder being a singleton bug (#2145)
 
 Version 5.4.0
 ----------
diff --git a/common b/common
index 18da6e27c..2abf43305 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 18da6e27ced2d415d5dc6918ffe9749db85ca52e
+Subproject commit 2abf433054e428ceb8169d77a2ac6bf86f0153d4
diff --git a/msal/build.gradle b/msal/build.gradle
index 7eae5c6e9..a99f8ba89 100644
--- 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 = "17.7.0"
 if (project.hasProperty("distCommonVersion")) {
     commonVersion = project.distCommonVersion
 }
 // Used for testfixtures
-def common4jVersion = "1.0.+"
+def common4jVersion = "14.7.0"
 if (project.hasProperty("distCommon4jVersion")) {
     distCommon4jVersion = project.distCommon4jVersion
 }
@@ -309,16 +309,16 @@ afterEvaluate {
     // Gradle 6.1.1 and Android Gradle Plugin 4.0.1 doesn't rename the file (see 'outputFileName' above)
     // Adding this work around to have the file properly renamed.
     // Please uncomment the section below for the Maven release step only. Currently troubleshooting why this extra renaming configuration is still needed for MSAL.
-//    tasks.named("assembleDistRelease").configure {
-//        def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar")
-//        print "Build file $buildFile"
-//        doLast {
-//            println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'"
-//            if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) {
-//                println "Rename failed!"
-//            }
-//        }
-//    }
+    tasks.named("assembleDistRelease").configure {
+        def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar")
+        print "Build file $buildFile"
+        doLast {
+            println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'"
+            if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) {
+                println "Rename failed!"
+            }
+        }
+    }
     publishing {
         publications {
             msal(MavenPublication) {
diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties
index 377437985..35f8b1f0d 100644
--- a/msal/versioning/version.properties
+++ b/msal/versioning/version.properties
@@ -1,3 +1,3 @@
 #Wed Aug 01 15:24:11 PDT 2018
-versionName=5.4.2
+versionName=5.5.0
 versionCode=0
diff --git a/msalautomationapp/build.gradle b/msalautomationapp/build.gradle
index aa94b02f0..66ae801ee 100644
--- a/msalautomationapp/build.gradle
+++ b/msalautomationapp/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
-def msalVersion = "5.4.0"
+def msalVersion = "5.+"
 
 if (project.hasProperty("distMsalVersion")) {
     msalVersion = distMsalVersion