From 5df040771120d9854a635b139e62a2ba548ce347 Mon Sep 17 00:00:00 2001 From: fadidurah <88730756+fadidurah@users.noreply.github.com> Date: Thu, 9 Jan 2025 22:58:23 -0500 Subject: [PATCH] Merging Alias to release January 2025 (#2239) Merging Alias to release January 2025 --- changelog | 3 ++- common | 2 +- msal/build.gradle | 4 ++-- msal/versioning/version.properties | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/changelog b/changelog index 18e000632..4245c454c 100644 --- a/changelog +++ b/changelog @@ -1,8 +1,9 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki -vNext +Version 5.9.0 ---------- -[MINOR] Add suberror for network errors (#2218) +-[PATCH] Update common @19.0.0 Version 5.8.2 ---------- diff --git a/common b/common index 3d7fe9e66..994a2c25d 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 3d7fe9e660aed4cb8cafdb5f3041ed0618bf95d8 +Subproject commit 994a2c25d16c8eb0db496fb6db21c322abcc70c8 diff --git a/msal/build.gradle b/msal/build.gradle index 08683e128..a2c0781a3 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 = "19.0.0" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "1.0.+" +def common4jVersion = "16.0.0" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index 87f9d5529..7a63bade7 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.8.2 +versionName=5.9.0 versionCode=0