letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Use new retrofit bom and change Maven coordinates of kotlinx-serialization

Browse Source
This commit is contained in:
Benoit Marty
2024-03-25 09:54:52 +01:00
committed by Benoit Marty
parent 59c463759e
commit 9605a783a2
6 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
features/login/impl/build.gradle.kts
View File

@@ -50,6 +50,7 @@ dependencies {
implementation(projects.libraries.testtags)
implementation(projects.libraries.uiStrings)
implementation(libs.androidx.browser)
implementation(platform(libs.network.retrofit.bom))
implementation(libs.network.retrofit)
implementation(libs.serialization.json)
api(projects.features.login.api)

5
gradle/libs.versions.toml
View File

@@ -120,8 +120,9 @@ network_okhttp_logging = { module = "com.squareup.okhttp3:logging-interceptor" }
network_okhttp_okhttp = { module = "com.squareup.okhttp3:okhttp" }
network_okhttp = { module = "com.squareup.okhttp3:okhttp" }
network_mockwebserver = { module = "com.squareup.okhttp3:mockwebserver" }
network_retrofit = "com.squareup.retrofit2:retrofit:2.10.0"
network_retrofit_converter_serialization = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
network_retrofit_bom = "com.squareup.retrofit2:retrofit-bom:2.10.0"
network_retrofit = { module = "com.squareup.retrofit2:retrofit" }
network_retrofit_converter_serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization" }
# Test
test_core = { module = "androidx.test:core", version.ref = "test_core" }

1
libraries/network/build.gradle.kts
View File

@@ -41,6 +41,7 @@ dependencies {
implementation(platform(libs.network.okhttp.bom))
implementation(libs.network.okhttp)
implementation(libs.network.okhttp.logging)
implementation(platform(libs.network.retrofit.bom))
implementation(libs.network.retrofit)
implementation(libs.network.retrofit.converter.serialization)
implementation(libs.serialization.json)

2
libraries/network/src/main/kotlin/io/element/android/libraries/network/RetrofitFactory.kt
View File

@@ -16,12 +16,12 @@
package io.element.android.libraries.network
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
import io.element.android.libraries.core.uri.ensureTrailingSlash
import kotlinx.serialization.json.Json
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import retrofit2.Retrofit
import retrofit2.converter.kotlinx.serialization.asConverterFactory
import javax.inject.Inject
import javax.inject.Provider

1
libraries/push/impl/build.gradle.kts
View File

@@ -38,6 +38,7 @@ dependencies {
implementation(libs.androidx.corektx)
implementation(libs.androidx.datastore.preferences)
implementation(libs.androidx.security.crypto)
implementation(platform(libs.network.retrofit.bom))
implementation(libs.network.retrofit)
implementation(libs.serialization.json)
implementation(libs.coil)

1
libraries/pushproviders/unifiedpush/build.gradle.kts
View File

@@ -42,6 +42,7 @@ dependencies {
implementation(projects.libraries.network)
implementation(platform(libs.network.okhttp.bom))
implementation(libs.network.okhttp.okhttp)
implementation(platform(libs.network.retrofit.bom))
implementation(libs.network.retrofit)
implementation(libs.serialization.json)