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 Kotlin to v2.2.0 (#5408)

Browse Source
This commit is contained in:
David Perez 2025-06-23 15:57:10 -05:00 committed by GitHub
parent ac1a9a2dc0
commit 1e4fc31ed4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
annotation/build.gradle.kts
View File

@ -37,6 +37,6 @@ android {
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
}
}

2
app/build.gradle.kts
View File

@ -193,7 +193,7 @@ android {
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
}
}

2
authenticator/build.gradle.kts
View File

@ -143,7 +143,7 @@ android {
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
}
}

2
authenticatorbridge/build.gradle.kts
View File

@ -54,7 +54,7 @@ android {
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
}
}

11
core/build.gradle.kts
View File

@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.hilt)
@ -32,9 +34,6 @@ android {
sourceCompatibility(libs.versions.jvmTarget.get())
targetCompatibility(libs.versions.jvmTarget.get())
}
kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
}
}
dependencies {
@ -54,6 +53,12 @@ dependencies {
testImplementation(libs.mockk.mockk)
}
kotlin {
compilerOptions {
jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
}
}
tasks {
withType<Test> {
useJUnitPlatform()

2
data/build.gradle.kts
View File

@ -40,7 +40,7 @@ android {
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
}
}

4
gradle/libs.versions.toml
View File

@ -39,12 +39,12 @@ hilt = "2.56.2"
junit5 = "5.13.1"
jvmTarget = "17"
# kotlin and ksp **must** use compatible versions, do not update either without the other.
kotlin = "2.1.21"
kotlin = "2.2.0"
kotlinxCollectionsImmutable = "0.4.0"
kotlinxCoroutines = "1.10.2"
kotlinxSerialization = "1.8.1"
kotlinxKover = "0.9.1"
ksp = "2.1.21-2.0.1"
ksp = "2.2.0-RC3-2.0.2"
mockk = "1.14.2"
okhttp = "4.12.0"
retrofitBom = "3.0.0"

4
network/build.gradle.kts
View File

@ -23,7 +23,7 @@ android {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
"proguard-rules.pro",
)
}
}
@ -39,7 +39,7 @@ android {
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
}
}

11
ui/build.gradle.kts
View File

@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
@ -35,9 +37,6 @@ android {
unitTests.isIncludeAndroidResources = true
unitTests.isReturnDefaultValues = true
}
kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
}
@Suppress("UnstableApiUsage")
testFixtures {
enable = true
@ -88,6 +87,12 @@ dependencies {
testFixturesImplementation(libs.square.turbine)
}
kotlin {
compilerOptions {
jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
}
}
tasks {
withType<Test> {
useJUnitPlatform()