bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-12-11 04:39:19 -06:00
Code Issues Packages Projects Releases 169 Wiki Activity

[deps]: Update kotlin to v2 (major) (#108)

Browse Source
This commit is contained in:
renovate[bot] 2024-06-14 15:09:01 -04:00 committed by GitHub
parent f912e00d21
commit 31f45ae5a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -26,3 +26,4 @@ local.properties
# Fastlane
fastlane/report.xml
fastlane/README.md
/.kotlin/

14
app/build.gradle.kts
View File

@ -1,10 +1,12 @@
import com.google.protobuf.gradle.proto
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.crashlytics)
alias(libs.plugins.hilt)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose.compiler)
alias(libs.plugins.kotlin.parcelize)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.kotlinx.kover)
@ -53,16 +55,10 @@ android {
sourceCompatibility(libs.versions.jvmTarget.get())
targetCompatibility(libs.versions.jvmTarget.get())
}
kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
}
buildFeatures {
buildConfig = true
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get()
}
packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1,LICENSE*.md}"
@ -77,6 +73,12 @@ android {
}
}
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
}
}
dependencies {
implementation(libs.androidx.activity.compose)

1
build.gradle.kts
View File

@ -5,6 +5,7 @@ plugins {
alias(libs.plugins.google.services) apply false
alias(libs.plugins.hilt) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.compose.compiler) apply false
alias(libs.plugins.kotlin.parcelize) apply false
alias(libs.plugins.kotlinx.kover) apply false
alias(libs.plugins.ksp) apply false

11
gradle/libs.versions.toml
View File

@ -39,16 +39,12 @@ googleServices = "4.4.1"
hilt = "2.51.1"
junit5 = "5.10.2"
jvmTarget = "17"
# kotlin and kotlinCompileExtensions **must** use compatible versions. Do not update either without
# first checking the Compose to Kotlin Compatibility Map.
# https://developer.android.com/jetpack/androidx/releases/compose-kotlin
kotlin = "1.9.24"
kotlinCompilerExtensionVersion = "1.5.14"
kotlin = "2.0.0"
kotlinxCollectionsImmutable = "0.3.7"
kotlinxCoroutines = "1.8.1"
kotlinxSerialization = "1.6.3"
kotlinxKover = "0.8.0"
ksp = "1.9.24-1.0.20"
ksp = "2.0.0-1.0.22"
mockk = "1.13.10"
okhttp = "4.12.0"
retrofit = "2.11.0"
@ -70,8 +66,6 @@ androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycl
androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "androidxCamera" }
androidx-compose-animation = { module = "androidx.compose.animation:animation" }
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidxComposeBom" }
# Included so that Renovate tracks updates since Compose Compiler is not referenced directly in `dependency {}` blocks.
androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "kotlinCompilerExtensionVersion" }
androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
androidx-compose-ui = { module = "androidx.compose.ui:ui" }
@ -132,6 +126,7 @@ google-protobuf = { id = "com.google.protobuf", version.ref = "googleProtoBufPlu
google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" }
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
kotlinx-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kotlinxKover" }