From a54a1f840b952967a3afa18336fad372d9fc4278 Mon Sep 17 00:00:00 2001
From: melissaahn <melissaahn@microsoft.com>
Date: Thu, 30 May 2024 10:53:01 -0700
Subject: [PATCH] Updating YubiKit and CredMan versions (#2417)

### Summary
Latest versions:
- CredMan 1.2.2:
https://developer.android.com/jetpack/androidx/releases/credentials#1.2.2
- YubiKit 2.5.0: https://github.com/Yubico/yubikit-android/releases

Manual testing was conducted and passed.
---
 changelog.txt          | 1 +
 gradle/versions.gradle | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index f8c91193dc..ac7e68c727 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,7 @@
 V.Next
 ---------
 - [MINOR] Update logic for matching requested claims for AT (#2401)
+- [MINOR] Updating YubiKit and CredMan versions (#2417)
 
 Version 17.4.0
 ---------
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index c5a2886f5c..aab4b50e5c 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -66,8 +66,8 @@ ext {
     tokenShare = "1.6.5"
     intuneAppSdkVersion = "8.6.3"
     javaAssistVersion = "3.27.0-GA"
-    yubikitAndroidVersion = "2.3.0"
-    yubikitPivVersion = "2.3.0"
+    yubikitAndroidVersion = "2.5.0"
+    yubikitPivVersion = "2.5.0"
     powerliftAndroidVersion="1.0.3"
     kotlinXCoroutinesVersion = "1.6.4"
     mockkVersion = "1.11.0"
@@ -79,7 +79,7 @@ ext {
     jetpackDataStoreVersion = "1.0.0"
     blockstoreVersion="16.2.0"
     lifecycleKtxVersion="2.5.1"
-    AndroidCredentialsVersion="1.2.0"
+    AndroidCredentialsVersion="1.2.2"
 
     // microsoft-diagnostics-uploader app versions
     powerliftVersion = "0.14.7"