Skip to content

Commit

Permalink
Bump Kotlin to 2.0.0 (#384)
Browse files Browse the repository at this point in the history
* Bump Kotlin to 2.0.0

* Don't bundle the runtime
  • Loading branch information
hfhbd authored May 20, 2024
1 parent 7be39cf commit aed535d
Show file tree
Hide file tree
Showing 9 changed files with 6,124 additions and 2,976 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.gradle
.idea
.kotlin
build
local.properties
.DS_Store
.DS_Store
10 changes: 6 additions & 4 deletions bootstrap-compose-icons/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("org.jetbrains.compose")
id("sign")
kotlin("plugin.compose")
}

val generateSVG by tasks.registering(app.softwork.bootstrapcompose.icons.ConvertSvg::class) {
Expand All @@ -14,10 +14,12 @@ kotlin.sourceSets.main {
}

dependencies {
api(compose.html.core)
api(compose.html.svg)
compileOnly(libs.compose.runtime)
api(libs.compose.html.core)
api(libs.compose.html.svg)
implementation(devNpm("bootstrap-icons", "1.11.1"))

testImplementation(compose.html.testUtils)
testImplementation(kotlin("test"))
testImplementation(libs.compose.runtime)
testImplementation(libs.compose.html.testUtils)
}
11 changes: 7 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
import io.gitlab.arturbosch.detekt.*

plugins {
id("org.jetbrains.compose") version "1.5.12"
id("sign")
kotlin("plugin.compose")
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
id("io.gitlab.arturbosch.detekt") version "1.23.6"
id("app.cash.licensee") version "1.11.0"
}

dependencies {
api("app.softwork:kotlinx-uuid-core:0.0.25")
api(compose.html.core)
api(libs.uuid)
compileOnly(libs.compose.runtime)
api(libs.compose.html.core)
api(npm("bootstrap", "5.2.3"))
api(npm("@popperjs/core", "2.11.5"))

testImplementation(compose.html.testUtils)
testImplementation(kotlin("test"))
testImplementation(libs.compose.runtime)
testImplementation(libs.compose.html.testUtils)
testImplementation(libs.coroutines.test)
}

licensee {
Expand Down
1 change: 1 addition & 0 deletions gradle/build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {

dependencies {
implementation(libs.plugins.kotlin.js.toDep())
implementation(libs.plugins.kotlin.plugin.compose.toDep())
implementation("io.github.pdvrieze.xmlutil:serialization-jvm:0.86.3") {
exclude("io.github.pdvrieze.xmlutil", "core")
}
Expand Down
19 changes: 18 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,19 @@
[versions]
kotlin = "2.0.0-RC3"
compose = "1.6.10-rc03"
coroutines = "1.8.1"

[libraries]
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }

compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose" }
compose-html-core = { module = "org.jetbrains.compose.html:html-core", version.ref = "compose" }
compose-html-svg = { module = "org.jetbrains.compose.html:html-svg", version.ref = "compose" }
compose-html-testUtils = { module = "org.jetbrains.compose.html:html-test-utils", version.ref = "compose" }

uuid = { module = "app.softwork:kotlinx-uuid-core", version = "0.0.25" }

[plugins]
kotlin-js = { id = "org.jetbrains.kotlin.js", version = "1.9.21" }
kotlin-js = { id = "org.jetbrains.kotlin.js", version.ref = "kotlin" }
kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
Loading

0 comments on commit aed535d

Please sign in to comment.