mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-21 08:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Update to Kotlin 2.0.0 (#1397)

Browse source
This commit is contained in:
David Perez 2024-05-29 10:36:35 -05:00 committed by Álison Fernandes
parent 6ff39e486d
commit 48906ae207
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/renovate.json vendored
View file

@ -35,7 +35,6 @@
"groupName": "kotlin",
"description": "Kotlin and Compose dependencies that must be updated together to maintain compatibility.",
"matchPackagePatterns": [
"androidx.compose.compiler:compiler",
"androidx.compose:compose-bom",
"org.jetbrains.kotlin.*",
"com.google.devtools.ksp"

3
.gitignore vendored
View file

@ -7,6 +7,9 @@ fastlane/README.md
.DS_Store
Thumbs.db
# Kotlin
.kotlin/
# Gradle build cache
/build-cache/

14
app/build.gradle.kts
View file

@ -1,6 +1,7 @@
import com.google.firebase.crashlytics.buildtools.gradle.tasks.InjectMappingFileIdTask
import com.google.firebase.crashlytics.buildtools.gradle.tasks.UploadMappingFileTask
import com.google.gms.googleservices.GoogleServicesTask
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
alias(libs.plugins.android.application)
@ -10,6 +11,7 @@ plugins {
alias(libs.plugins.detekt)
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)
@ -90,16 +92,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}"
@ -113,6 +109,12 @@ android {
}
}
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
}
}
dependencies {
fun standardImplementation(dependencyNotation: Any) {
add("standardImplementation", dependencyNotation)

1
build.gradle.kts
View file

@ -2,6 +2,7 @@ plugins {
alias(libs.plugins.android.application) 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

10
gradle/libs.versions.toml
View file

@ -33,16 +33,13 @@ 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 and ksp **must** use compatible versions, do not update either without the other.
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.21"
mockk = "1.13.11"
okhttp = "4.12.0"
retrofitBom = "2.11.0"
@ -120,6 +117,7 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
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" }