From 5ea8c7e6b580f3c42589d28d3b5a9c82b4036a61 Mon Sep 17 00:00:00 2001 From: pedro romero vargas <76129899+p3dr0rv@users.noreply.github.com> Date: Mon, 12 Feb 2024 15:00:24 -0800 Subject: [PATCH] Pedroro/release/5.1.0 (#2036) Co-authored-by: fadidurah --- .github/workflows/label.yml | 2 ++ changelog | 4 ++++ common | 2 +- msal/build.gradle | 6 ++++-- msal/versioning/version.properties | 2 +- testapps/testapp/build.gradle | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index 62e01ce182..950c1b9374 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -11,6 +11,8 @@ on: jobs: label: + permissions: + pull-requests: write runs-on: ubuntu-latest steps: - uses: actions/labeler@v2 diff --git a/changelog b/changelog index 945e290ee9..872f182bf4 100644 --- a/changelog +++ b/changelog @@ -2,6 +2,10 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr vNext ---------- + +Version 5.1.0 +---------- +- [PATCH] Update common @17.1.0 - [PATCH] Fix MSAL Issue #1864 (#2003) - [MINOR] Add isQRPinAvailable API to MSAL IPublicClientApplication (#1931) - [MINOR] Add PreferredAuthMethod to interactive token flow (#1964) diff --git a/common b/common index f1d9f52e39..385fddc29f 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit f1d9f52e39b59ad82c8eba5896b4934d8721bbc0 +Subproject commit 385fddc29f05cdd943fe55531b9db9b7ea6ab90a diff --git a/msal/build.gradle b/msal/build.gradle index b15d99b705..0182f114bf 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -188,8 +188,10 @@ 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.+" - +def commonVersion = "17.1.0" +if (project.hasProperty("distCommonVersion")) { + commonVersion = project.distCommonVersion +} dependencies { //Please leave this in... desugaring is currently disabled by default; however it's required for running some tests coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$rootProject.ext.coreLibraryDesugaringVersion" diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index 0d9d95ca7f..caa5c25acc 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.0.1 +versionName=5.1.0 versionCode=0 diff --git a/testapps/testapp/build.gradle b/testapps/testapp/build.gradle index 9b5dc64c63..895fd78df4 100644 --- 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.+" +def msalVersion = "5.1.0" if (project.hasProperty("distMsalVersion")) { msalVersion = distMsalVersion