nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(deps): upgrade to kotlin 2.0

Browse source
This commit is contained in:
Jarne Demeulemeester 2024-05-24 00:10:01 +02:00
parent 272daa5763
commit 038eb45077
No known key found for this signature in database
GPG key ID: 1E5C6AFBD622E9F5
4 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/tv/build.gradle.kts
View file

@ -1,6 +1,7 @@
plugins { plugins {
alias(libs.plugins.android.application) alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose.compiler)
alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.kotlin.parcelize)
alias(libs.plugins.hilt) alias(libs.plugins.hilt)
alias(libs.plugins.ksp) alias(libs.plugins.ksp)
@ -66,10 +67,6 @@ android {
compose = true compose = true
} }
composeOptions {
kotlinCompilerExtensionVersion = Versions.composeCompiler
}
packaging { packaging {
resources { resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}" excludes += "/META-INF/{AL2.0,LGPL2.1}"

1
buildSrc/src/main/kotlin/Versions.kt
View file

@ -11,6 +11,5 @@ object Versions {
val java = JavaVersion.VERSION_17 val java = JavaVersion.VERSION_17
const val composeCompiler = "1.5.14"
const val ktlint = "0.50.0" const val ktlint = "0.50.0"
} }

5
core/build.gradle.kts
View file

@ -1,6 +1,7 @@
plugins { plugins {
alias(libs.plugins.android.library) alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose.compiler)
alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.kotlin.parcelize)
alias(libs.plugins.ksp) alias(libs.plugins.ksp)
alias(libs.plugins.androidx.navigation.safeargs) alias(libs.plugins.androidx.navigation.safeargs)
@ -39,10 +40,6 @@ android {
buildFeatures { buildFeatures {
compose = true compose = true
} }
composeOptions {
kotlinCompilerExtensionVersion = Versions.composeCompiler
}
} }
ktlint { ktlint {

5
gradle/libs.versions.toml
View file

@ -30,9 +30,9 @@ hilt = "2.51.1"
compose-destinations = "1.10.2" compose-destinations = "1.10.2"
jellyfin = "1.4.7" jellyfin = "1.4.7"
junit = "4.13.2" junit = "4.13.2"
kotlin = "1.9.24" kotlin = "2.0.0"
kotlinx-serialization = "1.6.3" kotlinx-serialization = "1.6.3"
ksp = "1.9.24-1.0.20" ksp = "2.0.0-1.0.21"
ktlint = "12.1.1" ktlint = "12.1.1"
libmpv = "0.2.0" libmpv = "0.2.0"
material = "1.12.0" material = "1.12.0"
@ -107,6 +107,7 @@ android-library = { id = "com.android.library", version.ref = "android-plugin" }
androidx-navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "androidx-navigation" } androidx-navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "androidx-navigation" }
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } 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-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }