mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-03-16 03:08:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Update Kotlin serialization to latest version (1.7.0) (#1440)

Browse source
This commit is contained in:
David Perez 2024-06-10 12:27:04 -05:00 • committed by Álison Fernandes
parent e8df4c8c95
commit 8b5210e27a
5 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/JwtTokenUtils.kt
View file

@ -2,13 +2,11 @@ package com.x8bit.bitwarden.data.auth.repository.util
import com.x8bit.bitwarden.data.auth.repository.model.JwtTokenDataJson
import com.x8bit.bitwarden.data.platform.datasource.network.util.base64UrlDecodeOrNull
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.json.Json
/**
* Internal, generally basic [Json] instance for JWT parsing purposes.
*/
@OptIn(ExperimentalSerializationApi::class)
private val json: Json by lazy {
Json {
ignoreUnknownKeys = true

2
app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/di/PlatformNetworkModule.kt
View file

@ -16,7 +16,6 @@ import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.json.Json
import kotlinx.serialization.modules.SerializersModule
import kotlinx.serialization.modules.contextual
@ -76,7 +75,6 @@ object PlatformNetworkModule {
json = json,
)
@OptIn(ExperimentalSerializationApi::class)
@Provides
@Singleton
fun providesJson(): Json = Json {

2
app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt
View file

@ -5,7 +5,6 @@ import app.cash.turbine.test
import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson
import com.x8bit.bitwarden.data.platform.base.FakeSharedPreferences
import kotlinx.coroutines.test.runTest
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.json.Json
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertNull
@ -14,7 +13,6 @@ import org.junit.jupiter.api.Test
class EnvironmentDiskSourceTest {
private val fakeSharedPreferences = FakeSharedPreferences()
@OptIn(ExperimentalSerializationApi::class)
private val json = Json {
ignoreUnknownKeys = true
explicitNulls = false

2
app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceTest.kt
View file

@ -4,7 +4,6 @@ import androidx.core.content.edit
import com.x8bit.bitwarden.data.platform.base.FakeSharedPreferences
import com.x8bit.bitwarden.data.tools.generator.repository.model.PasscodeGenerationOptions
import com.x8bit.bitwarden.data.tools.generator.repository.model.UsernameGenerationOptions
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
import org.junit.jupiter.api.Assertions.assertEquals
@ -15,7 +14,6 @@ import org.junit.jupiter.api.Test
class GeneratorDiskSourceTest {
private val fakeSharedPreferences = FakeSharedPreferences()
@OptIn(ExperimentalSerializationApi::class)
private val json = Json {
ignoreUnknownKeys = true
explicitNulls = false

2
gradle/libs.versions.toml
View file

@ -37,7 +37,7 @@ jvmTarget = "17"
kotlin = "2.0.0"
kotlinxCollectionsImmutable = "0.3.7"
kotlinxCoroutines = "1.8.1"
kotlinxSerialization = "1.6.3"
kotlinxSerialization = "1.7.0"
kotlinxKover = "0.8.1"
ksp = "2.0.0-1.0.22"
mockk = "1.13.11"