From 5c00de3e3cdd6c06aa457845a646172b455d67c7 Mon Sep 17 00:00:00 2001 From: pedro romero vargas Date: Mon, 3 Feb 2025 15:41:57 -0800 Subject: [PATCH 1/7] update RC --- changelog | 4 ++++ common | 2 +- msal/build.gradle | 4 ++-- msal/versioning/version.properties | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changelog b/changelog index aab2ce2180..c09855dd8f 100644 --- a/changelog +++ b/changelog @@ -2,6 +2,10 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr vNext ---------- + +Version 5.10.0-RC1 +---------- +- [PATCH] Update common @20.0.0-RC1 - [MINOR] Change AndroidActivityInteractiveTokenCommandParameters to AndroidInteractiveTokenCommandParameters (#2247) - [MINOR] Move native auth public methods to parameter class (#2245) - [MINOR] Add support for claims requests for native auth sign in (#2246) diff --git a/common b/common index 943fc16252..2be91b06e9 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 943fc162520b6c39b97cc59fb44e7f7038429f3e +Subproject commit 2be91b06e9065dd56c669197498ba8834a1ad608 diff --git a/msal/build.gradle b/msal/build.gradle index 08683e128b..eab3c5df55 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 = "20.0.0-RC1" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "1.0.+" +def common4jVersion = "17.0.0-RC1" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index 7a63bade7d..7b2d5e4b4c 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.9.0 +versionName=5.10.0-RC1 versionCode=0 From 024840a7c4742798308b351c60c7f04aa915e2d6 Mon Sep 17 00:00:00 2001 From: pedro romero vargas Date: Mon, 3 Feb 2025 22:40:09 -0800 Subject: [PATCH 2/7] update to RC2 --- changelog | 4 ++-- common | 2 +- msal/build.gradle | 4 ++-- msal/versioning/version.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/changelog b/changelog index c09855dd8f..eca222d271 100644 --- a/changelog +++ b/changelog @@ -3,9 +3,9 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr vNext ---------- -Version 5.10.0-RC1 +Version 5.10.0-RC2 ---------- -- [PATCH] Update common @20.0.0-RC1 +- [PATCH] Update common @20.0.0-RC2 - [MINOR] Change AndroidActivityInteractiveTokenCommandParameters to AndroidInteractiveTokenCommandParameters (#2247) - [MINOR] Move native auth public methods to parameter class (#2245) - [MINOR] Add support for claims requests for native auth sign in (#2246) diff --git a/common b/common index 2be91b06e9..76390cae2a 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 2be91b06e9065dd56c669197498ba8834a1ad608 +Subproject commit 76390cae2ab382abafd7bb598455572d33d7b3fc diff --git a/msal/build.gradle b/msal/build.gradle index eab3c5df55..5fd1540945 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 = "20.0.0-RC1" +def commonVersion = "20.0.0-RC2" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "17.0.0-RC1" +def common4jVersion = "17.0.0-RC2" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index 7b2d5e4b4c..24ebc9ecfd 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.10.0-RC1 +versionName=5.10.0-RC2 versionCode=0 From fc2a5fcd74ca475199424a5d0617f099bef8cba2 Mon Sep 17 00:00:00 2001 From: pedro romero vargas Date: Tue, 4 Feb 2025 21:09:04 -0800 Subject: [PATCH 3/7] rc3 --- changelog | 4 ++-- common | 2 +- msal/build.gradle | 4 ++-- msal/versioning/version.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/changelog b/changelog index eca222d271..ac78ef47d4 100644 --- a/changelog +++ b/changelog @@ -3,9 +3,9 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr vNext ---------- -Version 5.10.0-RC2 +Version 5.10.0-RC3 ---------- -- [PATCH] Update common @20.0.0-RC2 +- [PATCH] Update common @20.0.0-RC3 - [MINOR] Change AndroidActivityInteractiveTokenCommandParameters to AndroidInteractiveTokenCommandParameters (#2247) - [MINOR] Move native auth public methods to parameter class (#2245) - [MINOR] Add support for claims requests for native auth sign in (#2246) diff --git a/common b/common index 76390cae2a..f1f491781b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 76390cae2ab382abafd7bb598455572d33d7b3fc +Subproject commit f1f491781b66ff44d68a29a1167ca4c563157cf8 diff --git a/msal/build.gradle b/msal/build.gradle index 5fd1540945..25b9b3930a 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 = "20.0.0-RC2" +def commonVersion = "20.0.0-RC3" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "17.0.0-RC2" +def common4jVersion = "17.0.0-RC3" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index 24ebc9ecfd..37db640784 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.10.0-RC2 +versionName=5.10.0-RC3 versionCode=0 From 4abf7e1e18d27e261832ace22b057c024f1af658 Mon Sep 17 00:00:00 2001 From: pedro romero vargas Date: Fri, 7 Feb 2025 17:22:19 -0800 Subject: [PATCH 4/7] RC4 --- changelog | 4 ++-- common | 2 +- msal/build.gradle | 4 ++-- msal/versioning/version.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/changelog b/changelog index ac78ef47d4..7d2fb6a4b6 100644 --- a/changelog +++ b/changelog @@ -3,9 +3,9 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr vNext ---------- -Version 5.10.0-RC3 +Version 5.10.0-RC4 ---------- -- [PATCH] Update common @20.0.0-RC3 +- [PATCH] Update common @20.0.0-RC4 - [MINOR] Change AndroidActivityInteractiveTokenCommandParameters to AndroidInteractiveTokenCommandParameters (#2247) - [MINOR] Move native auth public methods to parameter class (#2245) - [MINOR] Add support for claims requests for native auth sign in (#2246) diff --git a/common b/common index f1f491781b..7665153fc2 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit f1f491781b66ff44d68a29a1167ca4c563157cf8 +Subproject commit 7665153fc2f468fa9a4a7441a9c01beba0fc1e1f diff --git a/msal/build.gradle b/msal/build.gradle index 25b9b3930a..0c597336e9 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 = "20.0.0-RC3" +def commonVersion = "20.0.0-RC4" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "17.0.0-RC3" +def common4jVersion = "17.0.0-RC4" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index 37db640784..8e8d08e845 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.10.0-RC3 +versionName=5.10.0-RC4 versionCode=0 From 67f1f41d7db2302bb612603a14c2e710563ee36a Mon Sep 17 00:00:00 2001 From: pedro romero vargas Date: Sun, 9 Feb 2025 10:27:56 -0800 Subject: [PATCH 5/7] rc5 --- changelog | 4 ++-- common | 2 +- msal/build.gradle | 4 ++-- msal/versioning/version.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/changelog b/changelog index 7d2fb6a4b6..e535cec4e7 100644 --- a/changelog +++ b/changelog @@ -3,9 +3,9 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr vNext ---------- -Version 5.10.0-RC4 +Version 5.10.0-RC5 ---------- -- [PATCH] Update common @20.0.0-RC4 +- [PATCH] Update common @20.0.0-RC5 - [MINOR] Change AndroidActivityInteractiveTokenCommandParameters to AndroidInteractiveTokenCommandParameters (#2247) - [MINOR] Move native auth public methods to parameter class (#2245) - [MINOR] Add support for claims requests for native auth sign in (#2246) diff --git a/common b/common index 7665153fc2..99786756c3 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 7665153fc2f468fa9a4a7441a9c01beba0fc1e1f +Subproject commit 99786756c3cf4a18458146e47c3107f275787801 diff --git a/msal/build.gradle b/msal/build.gradle index 0c597336e9..e04a9fbfe6 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 = "20.0.0-RC4" +def commonVersion = "20.0.0-RC5" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "17.0.0-RC4" +def common4jVersion = "17.0.0-RC5" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index 8e8d08e845..2f120d9625 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.10.0-RC4 +versionName=5.10.0-RC5 versionCode=0 From aeec0e20d69feb437a1161ef7b4ab0857d28280c Mon Sep 17 00:00:00 2001 From: pedro romero vargas Date: Mon, 10 Feb 2025 00:12:42 -0800 Subject: [PATCH 6/7] remove rc --- changelog | 4 ++-- common | 2 +- msal/build.gradle | 4 ++-- msal/versioning/version.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/changelog b/changelog index e535cec4e7..685ecc9628 100644 --- a/changelog +++ b/changelog @@ -3,9 +3,9 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr vNext ---------- -Version 5.10.0-RC5 +Version 5.10.0 ---------- -- [PATCH] Update common @20.0.0-RC5 +- [PATCH] Update common @20.0.0 - [MINOR] Change AndroidActivityInteractiveTokenCommandParameters to AndroidInteractiveTokenCommandParameters (#2247) - [MINOR] Move native auth public methods to parameter class (#2245) - [MINOR] Add support for claims requests for native auth sign in (#2246) diff --git a/common b/common index 99786756c3..8fc0123bd8 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 99786756c3cf4a18458146e47c3107f275787801 +Subproject commit 8fc0123bd85130b0dc38c8b0d339b5ad5a88f792 diff --git a/msal/build.gradle b/msal/build.gradle index e04a9fbfe6..bfb6fd83b5 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 = "20.0.0-RC5" +def commonVersion = "20.0.0" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "17.0.0-RC5" +def common4jVersion = "17.0.0" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index 2f120d9625..2fddaa0764 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.10.0-RC5 +versionName=5.10.0 versionCode=0 From b577819ba380ac831a76d34af128eee057947cfd Mon Sep 17 00:00:00 2001 From: pedro romero vargas Date: Mon, 10 Feb 2025 01:22:14 -0800 Subject: [PATCH 7/7] maven changes --- msal/build.gradle | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index bfb6fd83b5..4a3f2ab96b 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -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) {