Skip to content

Commit

Permalink
Build: Update to Kotlin 2.0.0 and JetBrains Compose 1.6.10
Browse files Browse the repository at this point in the history
  • Loading branch information
zhanghai committed May 22, 2024
1 parent 6fac93a commit 0f2574d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
/.gradle/
/.idea/
/.kotlin/
/build/
/captures/
/composeApp/build/
/local.properties
/signing.jks
/signing.properties
/*/.gradle/
/*/build/
.DS_Store
*.iml
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
1 change: 1 addition & 0 deletions composeApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 4 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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" }

0 comments on commit 0f2574d

Please sign in to comment.