Bump kotlin version to 2.0.0 (#855)

* Bump kotlin version to 2.0.0

* fix

* feat: fixes

* feat: cleanup

* feat: fixes
This commit is contained in:
Yogesh Choudhary Paliyal
2024-06-02 14:24:21 +05:30
committed by GitHub
parent 76b78723df
commit 3b9c1cde48
4 changed files with 13 additions and 12 deletions

View File

@@ -6,6 +6,7 @@ plugins {
id("com.spotify.ruler")
id("com.google.dagger.hilt.android")
id("org.jetbrains.kotlin.plugin.serialization")
id("org.jetbrains.kotlin.plugin.compose")
}
val appPackageId = "com.yogeshpaliyal.keypass"
@@ -72,9 +73,6 @@ android {
composeOptions {
kotlinCompilerExtensionVersion = "1.5.13"
}
packagingOptions {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"

View File

@@ -14,6 +14,7 @@ buildscript {
classpath ("com.spotify.ruler:ruler-gradle-plugin:2.0.0-beta-1")
classpath ("com.gradle:gradle-enterprise-gradle-plugin:3.13.2")
classpath("org.jetbrains.kotlin:compose-compiler-gradle-plugin:${Versions.kotlin}")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle.kts files
}
@@ -23,7 +24,6 @@ plugins {
kotlin("android") version("1.8.0") apply false
id("com.android.application") version("7.4.2") apply false
id("com.android.library") version("7.4.2") apply false
id("org.jetbrains.compose") version "1.6.10" apply false
id ("com.diffplug.spotless") version("6.18.0")
id("org.jetbrains.kotlin.kapt") version(Versions.kotlin)
id("com.google.dagger.hilt.android") version ("2.51.1") apply false

View File

@@ -1,5 +1,5 @@
object Versions {
const val kotlin = "1.9.23"
const val kotlin = "2.0.0"
const val lifecycle = "2.6.1"
const val room = "2.5.2"
const val navigation = "2.5.3"

View File

@@ -1,20 +1,23 @@
plugins {
kotlin("multiplatform")
id("com.android.library")
id("org.jetbrains.compose")
id("org.jetbrains.kotlin.plugin.compose")
}
kotlin {
android()
androidTarget()
jvmToolchain(17)
jvm("desktop") {
jvmToolchain(11)
compilerOptions {
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
}
}
sourceSets {
val commonMain by getting {
dependencies {
api(compose.runtime)
api(compose.foundation)
api(compose.material)
api("androidx.compose.runtime:runtime:1.6.7")
api("androidx.compose.foundation:foundation:1.6.7")
api("androidx.compose.material:material:1.6.7")
implementation("org.reduxkotlin:redux-kotlin-compose:0.6.0")
}
}
@@ -36,7 +39,7 @@ kotlin {
}
val desktopMain by getting {
dependencies {
api(compose.preview)
}
}
val desktopTest by getting