diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt index 4ffe0cc8df..e318aeedd2 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt @@ -149,7 +149,6 @@ import io.mockk.unmockkStatic import io.mockk.verify import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.test.runTest -import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.JsonNull import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonPrimitive @@ -389,7 +388,6 @@ class AuthRepositoryTest { } @Test - @OptIn(ExperimentalSerializationApi::class) @Suppress("MaxLineLength") fun `loading the policies should emit masterPasswordPolicyFlow if the password fails any checks`() = runTest { diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/imports/parsers/ExportParser.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/imports/parsers/ExportParser.kt index 4ce7d55a35..91a4c943fa 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/imports/parsers/ExportParser.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/imports/parsers/ExportParser.kt @@ -36,15 +36,14 @@ abstract class ExportParser { * @param byteArray The input data to be parsed as a [ByteArray]. * @return [ExportParseResult] indicating success or a specific error result. */ - @OptIn(ExperimentalSerializationApi::class) fun parseForResult(byteArray: ByteArray): ExportParseResult = try { parse(byteArray = byteArray) - } catch (error: MissingFieldException) { + } catch (@OptIn(ExperimentalSerializationApi::class) _: MissingFieldException) { ExportParseResult.Error( title = BitwardenString.required_information_missing.asText(), message = BitwardenString.required_information_missing_message.asText(), ) - } catch (error: SerializationException) { + } catch (_: SerializationException) { ExportParseResult.Error( title = BitwardenString.file_could_not_be_processed.asText(), message = BitwardenString.file_could_not_be_processed_message.asText(), diff --git a/core/src/main/kotlin/com/bitwarden/core/di/CoreModule.kt b/core/src/main/kotlin/com/bitwarden/core/di/CoreModule.kt index b21cbc5f2e..dcc4de45b5 100644 --- a/core/src/main/kotlin/com/bitwarden/core/di/CoreModule.kt +++ b/core/src/main/kotlin/com/bitwarden/core/di/CoreModule.kt @@ -5,7 +5,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 @@ -38,7 +37,6 @@ object CoreModule { coerceInputValues = true // Allow trailing commas in JSON objects and arrays. - @OptIn(ExperimentalSerializationApi::class) allowTrailingComma = true } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 11c4ffa5e8..aeb290f84f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -40,15 +40,15 @@ googleProtoBufJava = "4.33.4" googleProtoBufPlugin = "0.9.6" googleServices = "4.4.4" googleReview = "2.0.2" -hilt = "2.57.2" +hilt = "2.58" junit = "6.0.2" jvmTarget = "21" -kotlin = "2.2.21" +kotlin = "2.3.0" kotlinxCollectionsImmutable = "0.4.0" kotlinxCoroutines = "1.10.2" -kotlinxSerialization = "1.9.0" +kotlinxSerialization = "1.10.0" kotlinxKover = "0.9.4" -ksp = "2.3.3" +ksp = "2.3.4" mockk = "1.14.7" okhttp = "5.3.2" retrofitBom = "3.0.0" diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/util/ParcelableRouteSerializer.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/util/ParcelableRouteSerializer.kt index e389b0aa60..0f2d6d7174 100644 --- a/ui/src/main/kotlin/com/bitwarden/ui/platform/util/ParcelableRouteSerializer.kt +++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/util/ParcelableRouteSerializer.kt @@ -5,8 +5,6 @@ import android.os.Parcelable import android.util.Base64 import androidx.core.os.ParcelCompat import com.bitwarden.annotation.OmitFromCoverage -import kotlinx.serialization.ExperimentalSerializationApi -import kotlinx.serialization.InternalSerializationApi import kotlinx.serialization.KSerializer import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.descriptors.buildClassSerialDescriptor @@ -85,7 +83,6 @@ import kotlin.reflect.KClass * The latter is useful in cases where the same `ViewModel` is used to handle these routes. */ @OmitFromCoverage -@OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class) open class ParcelableRouteSerializer( private val kClass: KClass, ) : KSerializer { diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/util/RouteUtil.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/util/RouteUtil.kt index 94df043e3b..99163f0e2e 100644 --- a/ui/src/main/kotlin/com/bitwarden/ui/platform/util/RouteUtil.kt +++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/util/RouteUtil.kt @@ -7,7 +7,6 @@ import kotlin.reflect.KClass /** * Gets the route string for an object. */ -@OptIn(InternalSerializationApi::class) fun T.toObjectNavigationRoute(): String = this::class.toObjectKClassNavigationRoute() /**