Migrate Base64 away from Msebera (in Android), Fixes AB#3077784 (#2210)

rpdome · web-flow · commit f1eb2d88d4df · 2024-11-01T20:45:08.000-07:00
[AB#3077784](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3077784)
diff --git a/changelog b/changelog
@@ -1,5 +1,9 @@
 MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
 
+vNext
+----------
+-[MINOR] Migrate Base64 away from Msebera (#2210)
+
 Version 5.7.0
 ----------
 -[PATCH] Update common @18.1.0
diff --git a/common b/common
@@ -1 +1 @@
-Subproject commit 1441232ee9e380b7a1362c7c3b60c950adb610df
+Subproject commit fc41b4c4e67752f3a0d520c69f8598070f2ae38a
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -48,7 +48,6 @@ ext {
     daggerVersion = "2.31.2"
     daggerCompilerVersion = "2.31.2"
     msal4jVersion = "1.10.0"
-    mseberaApacheHttpClientVersion = "4.5.8"
     moshiVersion = "1.14.0"
     moshiAdaptersVersion = "1.14.0"
     openpojoVersion = "0.9.1"
diff --git a/msal/build.gradle b/msal/build.gradle
@@ -214,7 +214,6 @@ dependencies {
         exclude module: 'asm'
     }
     implementation 'org.apache.httpcomponents.core5:httpcore5:5.3'
-    implementation "cz.msebera.android:httpclient:$rootProject.ext.mseberaApacheHttpClientVersion"
     implementation "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$rootProject.ext.kotlinXCoroutinesVersion"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$rootProject.ext.kotlinXCoroutinesVersion"

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,6 @@ dependencies {`
`214`	`214`	`exclude module: 'asm'`
`215`	`215`	`}`
`216`	`216`	`implementation 'org.apache.httpcomponents.core5:httpcore5:5.3'`
`217`		`- implementation "cz.msebera.android:httpclient:$rootProject.ext.mseberaApacheHttpClientVersion"`
`218`	`217`	`implementation "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion"`
`219`	`218`	`implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$rootProject.ext.kotlinXCoroutinesVersion"`
`220`	`219`	`testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$rootProject.ext.kotlinXCoroutinesVersion"`