Skip to content

Commit 4913d55

Browse files
stevdza-sanstevdza-san
committed
- Dependencies updated.
- Possibly fixed an issue of bootstrap CSS styles overriding your own CSS styles.
1 parent bd192c1 commit 4913d55

File tree

10 files changed

+49
-32
lines changed

10 files changed

+49
-32
lines changed

‎bootstrap/build.gradle.kts‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1+
import com.varabyte.kobweb.gradle.core.util.importCss
12
import com.varabyte.kobweb.gradle.library.util.configAsKobwebLibrary
2-
import kotlinx.html.link
33
import kotlinx.html.script
4+
import kotlinx.html.style
45

56
plugins {
67
alias(libs.plugins.kotlin.multiplatform)
7-
alias(libs.plugins.jetbrains.compose)
88
alias(libs.plugins.kobweb.library)
99
alias(libs.plugins.kotlin.compose)
1010
`maven-publish`
1111
}
1212

1313
group = "com.stevdza.san.bootstrap"
14-
version = "0.1.5"
14+
version = "0.1.6"
1515

1616
kotlin {
1717
configAsKobwebLibrary(includeServer = false)
1818

1919
sourceSets {
2020
commonMain.dependencies {
21-
implementation(compose.runtime)
21+
implementation(libs.compose.runtime)
2222
}
2323

2424
jsMain.dependencies {
25-
implementation(compose.html.core)
25+
implementation(libs.compose.html.core)
26+
implementation(libs.kobweb.core)
2627
implementation(libs.kobweb.compose)
27-
implementation(npm("bootstrap", "5.3.1"))
28+
implementation(libs.kobweb.silk.core)
29+
implementation(npm("bootstrap", "5.3.5"))
2830
}
2931
}
3032
}
@@ -34,15 +36,19 @@ kobweb {
3436
index {
3537
head.add {
3638
script {
37-
src = "https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js"
39+
src = "https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/js/bootstrap.bundle.min.js"
3840
}
39-
link {
40-
rel = "stylesheet"
41-
href = "https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css"
41+
style {
42+
importCss(
43+
url = "https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/css/bootstrap.min.css",
44+
layerName = "kotlin-bootstrap"
45+
)
4246
}
43-
link {
44-
rel = "stylesheet"
45-
href = "https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.0/font/bootstrap-icons.css"
47+
style {
48+
importCss(
49+
url = "https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.0/font/bootstrap-icons.css",
50+
layerName = "kotlin-bootstrap"
51+
)
4652
}
4753
}
4854
}

‎bootstrap/src/jsMain/kotlin/com/stevdza/san/kotlinbs/BootstrapApp.kt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.stevdza.san.kotlinbs
2+
3+
import com.varabyte.kobweb.silk.init.InitSilk
4+
import com.varabyte.kobweb.silk.init.InitSilkContext
5+
import com.varabyte.kobweb.silk.style.layer.SilkLayer
6+
import com.varabyte.kobweb.silk.style.layer.add
7+
8+
@InitSilk
9+
fun initBuildScriptLayers(ctx: InitSilkContext) {
10+
// Layer(s) referenced in build.gradle.kts
11+
ctx.stylesheet.cssLayers.add(
12+
"kotlin-bootstrap",
13+
after = SilkLayer.BASE
14+
)
15+
}

‎build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
alias(libs.plugins.kotlin.multiplatform) apply false
3-
alias(libs.plugins.jetbrains.compose) apply false
43
alias(libs.plugins.kobweb.application) apply false
54
alias(libs.plugins.kobweb.library) apply false
65
alias(libs.plugins.kobwebx.markdown) apply false

‎gradle/libs.versions.toml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
[versions]
2-
jetbrains-compose = "1.6.11"
3-
kobweb = "0.19.2"
4-
kotlin = "2.0.20"
2+
jetbrains-compose = "1.7.3"
3+
kobweb = "0.21.1"
4+
kotlin = "2.1.20"
55

66
[libraries]
7-
kobweb-api = { module = "com.varabyte.kobweb:kobweb-api", version.ref = "kobweb" }
87
kobweb-core = { module = "com.varabyte.kobweb:kobweb-core ", version.ref = "kobweb" }
98
kobweb-compose = { module = "com.varabyte.kobweb:kobweb-compose", version.ref = "kobweb" }
109
kobweb-silk-core = { module = "com.varabyte.kobweb:kobweb-silk", version.ref = "kobweb" }
1110
kobweb-silk-icons-fa = { module = "com.varabyte.kobwebx:silk-icons-fa", version.ref = "kobweb" }
12-
kobwebx-markdown = { module = "com.varabyte.kobwebx:kobwebx-markdown", version.ref = "kobweb" }
11+
compose-html-core = { module = "org.jetbrains.compose.html:html-core", version.ref = "jetbrains-compose" }
12+
compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "jetbrains-compose" }
1313

1414
[plugins]
15-
jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "jetbrains-compose" }
1615
kobweb-application = { id = "com.varabyte.kobweb.application", version.ref = "kobweb" }
1716
kobwebx-markdown = { id = "com.varabyte.kobwebx.markdown", version.ref = "kobweb" }
1817
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew‎

100644100755
File mode changed.

‎site/.kobweb/conf.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ server:
55
files:
66
dev:
77
contentRoot: "build/processedResources/js/main/public"
8-
script: "build/dist/js/developmentExecutable/kotlinbs.js"
9-
api: "build/libs/kotlinbs.jar"
8+
script: "build/kotlin-webpack/js/developmentExecutable/kotlinbs.js"
109
prod:
11-
script: "build/dist/js/productionExecutable/kotlinbs.js"
10+
script: "build/kotlin-webpack/js/productionExecutable/kotlinbs.js"
1211
siteRoot: ".kobweb/site"
1312

1413
port: 8080

‎site/build.gradle.kts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import com.varabyte.kobweb.gradle.application.util.configAsKobwebApplication
22

33
plugins {
44
alias(libs.plugins.kotlin.multiplatform)
5-
alias(libs.plugins.jetbrains.compose)
65
alias(libs.plugins.kobweb.application)
76
alias(libs.plugins.kotlin.compose)
87
}
@@ -23,11 +22,11 @@ kotlin {
2322

2423
sourceSets {
2524
commonMain.dependencies {
26-
implementation(compose.runtime)
25+
implementation(libs.compose.runtime)
2726
}
2827

2928
jsMain.dependencies {
30-
implementation(compose.html.core)
29+
implementation(libs.compose.html.core)
3130
implementation(libs.kobweb.core)
3231
implementation(libs.kobweb.silk.core)
3332
implementation(libs.kobweb.silk.icons.fa)

‎site/src/jsMain/kotlin/com/stevdza/san/kotlinbs/MyApp.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import com.varabyte.kobweb.silk.init.InitSilk
77
import com.varabyte.kobweb.silk.init.InitSilkContext
88
import com.varabyte.kobweb.silk.SilkApp
99
import com.varabyte.kobweb.silk.components.layout.Surface
10-
import com.varabyte.kobweb.silk.components.style.common.SmoothColorStyle
11-
import com.varabyte.kobweb.silk.components.style.toModifier
10+
import com.varabyte.kobweb.silk.style.common.SmoothColorStyle
11+
import com.varabyte.kobweb.silk.style.toModifier
1212

1313
import org.jetbrains.compose.web.css.*
1414

@@ -25,4 +25,4 @@ fun MyApp(content: @Composable () -> Unit) {
2525
content()
2626
}
2727
}
28-
}
28+
}

‎site/src/jsMain/kotlin/com/stevdza/san/kotlinbs/pages/Index.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package com.stevdza.san.kotlinbs.pages
22

33
import androidx.compose.runtime.*
44
import com.stevdza.san.kotlinbs.forms.BSSwitch
5-
import com.varabyte.kobweb.compose.foundation.layout.Box
5+
import com.varabyte.kobweb.compose.foundation.layout.Column
66
import com.varabyte.kobweb.core.Page
77

88
@Page
99
@Composable
1010
fun HomePage() {
11-
Box {
11+
Column {
1212
var isChecked by remember { mutableStateOf(false) }
1313

1414
BSSwitch(

0 commit comments

Comments
 (0)