bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-12-10 00:06:22 -06:00
Code Issues Packages Projects Releases 169 Wiki Activity

Update OkHttp to v5.1.0 (#5524)

Browse Source
This commit is contained in:
David Perez 2025-07-14 14:23:37 -05:00 committed by GitHub
parent b8f74cdefa
commit 8f783a43e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@ -257,11 +257,10 @@ dependencies {
implementation(libs.kotlinx.collections.immutable)
implementation(libs.kotlinx.coroutines.android)
implementation(libs.kotlinx.serialization)
implementation(platform(libs.square.okhttp.bom))
implementation(libs.square.okhttp)
implementation(libs.square.okhttp.logging)
implementation(platform(libs.square.retrofit.bom))
implementation(libs.square.retrofit)
implementation(libs.square.retrofit.kotlinx.serialization)
implementation(libs.timber)
implementation(libs.zxing.zxing.core)
@ -289,7 +288,6 @@ dependencies {
testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk)
testImplementation(libs.robolectric.robolectric)
testImplementation(libs.square.okhttp.mockwebserver)
testImplementation(libs.square.turbine)
}

2
app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkScopeInstance.kt
View File

@ -31,7 +31,7 @@ import com.x8bit.bitwarden.ui.platform.components.coachmark.model.CoachMarkHighl
import com.x8bit.bitwarden.ui.platform.components.tooltip.BitwardenToolTip
import com.x8bit.bitwarden.ui.platform.components.tooltip.BitwardenToolTipState
import com.x8bit.bitwarden.ui.platform.components.tooltip.rememberBitwardenToolTipState
import okhttp3.internal.toImmutableList
import kotlinx.collections.immutable.toImmutableList
import org.jetbrains.annotations.VisibleForTesting
/**

6
authenticator/build.gradle.kts
View File

@ -197,11 +197,6 @@ dependencies {
implementation(libs.kotlinx.collections.immutable)
implementation(libs.kotlinx.coroutines.android)
implementation(libs.kotlinx.serialization)
implementation(libs.square.okhttp)
implementation(libs.square.okhttp.logging)
implementation(platform(libs.square.retrofit.bom))
implementation(libs.square.retrofit)
implementation(libs.square.retrofit.kotlinx.serialization)
implementation(libs.zxing.zxing.core)
// For now we are restricted to running Compose tests for debug builds only
@ -222,7 +217,6 @@ dependencies {
testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk)
testImplementation(libs.robolectric.robolectric)
testImplementation(libs.square.okhttp.mockwebserver)
testImplementation(libs.square.turbine)
}

9
gradle/libs.versions.toml
View File

@ -46,7 +46,7 @@ kotlinxSerialization = "1.9.0"
kotlinxKover = "0.9.1"
ksp = "2.2.0-2.0.2"
mockk = "1.14.4"
okhttp = "4.12.0"
okhttp = "5.1.0"
retrofitBom = "3.0.0"
robolectric = "4.15.1"
sonarqube = "6.2.0.5505"
@ -116,9 +116,10 @@ kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-t
kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
mockk-mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
robolectric-robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
square-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
square-okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
square-okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
square-okhttp-bom = { module = "com.squareup.okhttp3:okhttp-bom", version.ref = "okhttp" }
square-okhttp = { module = "com.squareup.okhttp3:okhttp" }
square-okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor" }
square-okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver" }
square-retrofit = { module = "com.squareup.retrofit2:retrofit" }
square-retrofit-bom = { module = "com.squareup.retrofit2:retrofit-bom", version.ref = "retrofitBom" }
square-retrofit-kotlinx-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization" }

1
network/build.gradle.kts
View File

@ -49,6 +49,7 @@ dependencies {
implementation(libs.androidx.core.ktx)
implementation(libs.kotlinx.serialization)
implementation(platform(libs.square.okhttp.bom))
implementation(libs.square.okhttp)
implementation(libs.square.okhttp.logging)
implementation(platform(libs.square.retrofit.bom))