Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump kotlin to 2.0 #29

Merged
merged 1 commit into from
Jun 30, 2024
Merged

Bump kotlin to 2.0 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ captures
.externalNativeBuild
.cxx
local.properties
xcuserdata
xcuserdata
# Kotlin 2.0
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New build directory for Kotlin compilation data introduced in kotlin 2.0

.kotlin/
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ plugins {
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.kotlin.serialization) apply false
alias(libs.plugins.jetbrain.compose) apply false
alias(libs.plugins.kotlin.compose) apply false
alias(libs.plugins.spotless) apply false
id("convention.spotless") apply true
}
5 changes: 1 addition & 4 deletions catalog/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,10 @@ plugins {
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.android.application)
alias(libs.plugins.jetbrain.compose)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.kotlin.serialization)
}

compose {
kotlinCompilerPlugin = dependencies.compiler.forKotlin(libs.versions.kotlin.get())
}

@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
kotlin {
applyDefaultHierarchyTemplate()
Expand Down
5 changes: 1 addition & 4 deletions design/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ plugins {
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.android.library)
alias(libs.plugins.jetbrain.compose)
}

compose {
kotlinCompilerPlugin = dependencies.compiler.forKotlin(libs.versions.kotlin.get())
alias(libs.plugins.kotlin.compose)
}

@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
Expand Down
9 changes: 5 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[versions]
activity-compose = "1.9.0"
agp = "8.4.0"
agp = "8.4.2"
androidx-material = "1.6.7"
coil = "3.0.0-alpha06"
coroutines = "1.8.1"
foundation = "1.6.7"
kotlin = "1.9.23"
kotlin = "2.0.0"
kotlinx-serialization = "1.6.3"
ktor = "2.3.8"
compose-compiler = "1.5.13"
compose-jb = "1.6.1"
compose-compiler = "1.5.14"
compose-jb = "1.6.11"
spotless = "6.14.0"

[libraries]
Expand Down Expand Up @@ -48,5 +48,6 @@ android-library = { id = "com.android.library", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
jetbrain-compose = { id = "org.jetbrains.compose", version.ref = "compose-jb" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
868 changes: 563 additions & 305 deletions kotlin-js-store/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions sdui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ plugins {
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.android.library)
alias(libs.plugins.jetbrain.compose)
}

compose {
kotlinCompilerPlugin = dependencies.compiler.forKotlin(libs.versions.kotlin.get())
alias(libs.plugins.kotlin.compose)
}

@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
Expand Down
Loading