Skip to content

Commit aed535d

Browse files
authored
Bump Kotlin to 2.0.0 (#384)
* Bump Kotlin to 2.0.0 * Don't bundle the runtime
1 parent 7be39cf commit aed535d

File tree

9 files changed

+6124
-2976
lines changed

9 files changed

+6124
-2976
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.gradle
22
.idea
3+
.kotlin
34
build
45
local.properties
5-
.DS_Store
6+
.DS_Store

bootstrap-compose-icons/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id("org.jetbrains.compose")
32
id("sign")
3+
kotlin("plugin.compose")
44
}
55

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

1616
dependencies {
17-
api(compose.html.core)
18-
api(compose.html.svg)
17+
compileOnly(libs.compose.runtime)
18+
api(libs.compose.html.core)
19+
api(libs.compose.html.svg)
1920
implementation(devNpm("bootstrap-icons", "1.11.1"))
2021

21-
testImplementation(compose.html.testUtils)
2222
testImplementation(kotlin("test"))
23+
testImplementation(libs.compose.runtime)
24+
testImplementation(libs.compose.html.testUtils)
2325
}

build.gradle.kts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
import io.gitlab.arturbosch.detekt.*
22

33
plugins {
4-
id("org.jetbrains.compose") version "1.5.12"
54
id("sign")
5+
kotlin("plugin.compose")
66
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
77
id("io.gitlab.arturbosch.detekt") version "1.23.6"
88
id("app.cash.licensee") version "1.11.0"
99
}
1010

1111
dependencies {
12-
api("app.softwork:kotlinx-uuid-core:0.0.25")
13-
api(compose.html.core)
12+
api(libs.uuid)
13+
compileOnly(libs.compose.runtime)
14+
api(libs.compose.html.core)
1415
api(npm("bootstrap", "5.2.3"))
1516
api(npm("@popperjs/core", "2.11.5"))
1617

17-
testImplementation(compose.html.testUtils)
1818
testImplementation(kotlin("test"))
19+
testImplementation(libs.compose.runtime)
20+
testImplementation(libs.compose.html.testUtils)
21+
testImplementation(libs.coroutines.test)
1922
}
2023

2124
licensee {

gradle/build-logic/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55

66
dependencies {
77
implementation(libs.plugins.kotlin.js.toDep())
8+
implementation(libs.plugins.kotlin.plugin.compose.toDep())
89
implementation("io.github.pdvrieze.xmlutil:serialization-jvm:0.86.3") {
910
exclude("io.github.pdvrieze.xmlutil", "core")
1011
}

gradle/libs.versions.toml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,19 @@
1+
[versions]
2+
kotlin = "2.0.0-RC3"
3+
compose = "1.6.10-rc03"
4+
coroutines = "1.8.1"
5+
6+
[libraries]
7+
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
8+
coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
9+
10+
compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose" }
11+
compose-html-core = { module = "org.jetbrains.compose.html:html-core", version.ref = "compose" }
12+
compose-html-svg = { module = "org.jetbrains.compose.html:html-svg", version.ref = "compose" }
13+
compose-html-testUtils = { module = "org.jetbrains.compose.html:html-test-utils", version.ref = "compose" }
14+
15+
uuid = { module = "app.softwork:kotlinx-uuid-core", version = "0.0.25" }
16+
117
[plugins]
2-
kotlin-js = { id = "org.jetbrains.kotlin.js", version = "1.9.21" }
18+
kotlin-js = { id = "org.jetbrains.kotlin.js", version.ref = "kotlin" }
19+
kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

0 commit comments

Comments
 (0)