diff --git a/.gitignore b/.gitignore index 689b6a794..6ddf78b93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,9 @@ /.gradle/ /.idea/ +/.kotlin/ /build/ -/captures/ -/composeApp/build/ /local.properties -/signing.jks -/signing.properties +/*/.gradle/ +/*/build/ .DS_Store *.iml diff --git a/build.gradle.kts b/build.gradle.kts index aed43ac26..b45b6e0a9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,5 +9,6 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false alias(libs.plugins.jetbrains.compose) apply false + alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.kotlin.multiplatform) apply false } diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index d10d59f91..92e009301 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -8,6 +8,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig plugins { + alias(libs.plugins.kotlin.compose) alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.android.application) alias(libs.plugins.jetbrains.compose) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3bf1b977f..1bb8a811a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,10 +4,10 @@ android-compileSdk = "34" android-minSdk = "21" android-targetSdk = "34" androidx-activity = "1.9.0" -androidx-compose-ui = "1.6.6" +androidx-compose-ui = "1.6.7" androidx-core = "1.13.1" -jetbrains-compose = "1.6.2" -kotlin = "1.9.23" +jetbrains-compose = "1.6.10" +kotlin = "2.0.0" [libraries] androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } @@ -19,4 +19,5 @@ compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" android-application = { id = "com.android.application", version.ref = "android-buildTools" } android-library = { id = "com.android.library", version.ref = "android-buildTools" } jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "jetbrains-compose" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }