diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/JwtTokenUtils.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/JwtTokenUtils.kt index 595cdd3035..c83b7d72db 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/JwtTokenUtils.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/JwtTokenUtils.kt @@ -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 diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/di/PlatformNetworkModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/di/PlatformNetworkModule.kt index 18909c7976..aca1569a3e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/di/PlatformNetworkModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/di/PlatformNetworkModule.kt @@ -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 { diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt index eb034d1420..f7d1b6779b 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt @@ -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 diff --git a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceTest.kt index c7727b8ed4..76d92520f2 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceTest.kt @@ -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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 47e337c642..a0332d2468 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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"