From 562d44d1d865303e3eb0a0c4bed3948289fdeb90 Mon Sep 17 00:00:00 2001 From: Sowmya Malayanur <69237821+somalaya@users.noreply.github.com> Date: Thu, 25 Jan 2024 08:09:56 -0800 Subject: [PATCH] [Hotfix] Removed credman dependencies (#2019) Updated common version which has the changes to remove credman dependencies Also made robolectric sdk upgrade to run the UTs in monthly pipeline smoothly --------- Co-authored-by: melissaahn Co-authored-by: pedro romero vargas --- changelog | 5 +++++ common | 2 +- gradle/versions.gradle | 2 +- msal/build.gradle | 4 ++-- msal/versioning/version.properties | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/changelog b/changelog index 78bcd8169..a9c942d49 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,10 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki +Version 5.0.1 +---------- +- [PATCH] Update robolectricVersion 4.11.1 (#2015) +- [PATCH] Update common @17.0.1 + Version 5.0.0 ---------- - [MINOR] Update common @17.0.0 diff --git a/common b/common index 5d3fcf340..a23ad3440 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 5d3fcf3406bc73d02d58d2805ebac050e5e82703 +Subproject commit a23ad3440fc0879003f985fc3416a671718eef05 diff --git a/gradle/versions.gradle b/gradle/versions.gradle index fa1c78e6e..e5a9953d0 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -43,7 +43,7 @@ ext { powerMockVersion = "2.0.9" runnerVersion = "1.2.0" rulesVersion = "1.2.0" - robolectricVersion = "4.9.2" + robolectricVersion = "4.11.1" uiAutomatorVersion = "2.2.0" daggerVersion = "2.31.2" daggerCompilerVersion = "2.31.2" diff --git a/msal/build.gradle b/msal/build.gradle index 07699313f..fb5efce54 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -188,7 +188,7 @@ 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 : "17.0.0" +String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "17.0.1" dependencies { //Please leave this in... desugaring is currently disabled by default; however it's required for running some tests @@ -256,7 +256,7 @@ dependencies { } testLocalImplementation(testFixtures(project(":common4j"))) - String common4jVersion = project.hasProperty("distCommon4jVersion") ? project.distCommon4jVersion : "14.0.0" + String common4jVersion = project.hasProperty("distCommon4jVersion") ? project.distCommon4jVersion : "14.0.1" testDistImplementation(testFixtures("com.microsoft.identity:common4j:${common4jVersion}")) implementation platform("io.opentelemetry:opentelemetry-bom:$rootProject.ext.openTelemetryVersion") diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index e2b060aa3..0d9d95ca7 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.0 +versionName=5.0.1 versionCode=0