Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ subprojects {
)
.customRuleSets(
listOf(
"io.nlopez.compose.rules:ktlint:0.3.11",
"io.nlopez.compose.rules:ktlint:0.6.1",
),
)
licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
Expand Down
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ kotlin.incremental.js=true
kotlin.incremental.wasm=true
# KMP
kotlin.mpp.enableCInteropCommonization=true
kotlin.mpp.androidSourceSetLayoutVersion=2
org.jetbrains.compose.experimental.jscanvas.enabled=true
# Before publishing to central the library should be tested in local:
# ./gradlew publishToMavenLocal. This will generate sources for our source sets
Expand All @@ -28,4 +27,4 @@ mavenCentralUsername=
mavenCentralPassword=
signing.keyId=
signing.password=
signing.secretKeyRingFile=
signing.secretKeyRingFile=
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[versions]
kotlin = "2.3.20"
kotlin = "2.4.0"
agp = "8.13.1"
activityCompose = "1.13.0"
compose-plugin = "1.10.3"
kotlinxCollectionsImmutable = "0.4.0"
kotlinxCollectionsImmutable = "0.5.0"
truth = "1.4.5"
vanniktech = "0.36.0"
dokka = "2.2.0"
spotless = "8.4.0"
spotless = "8.6.0"
report = "1.5.0"
junitVersion = "1.3.0"
androidxTest = "1.7.0"
composeBom = "2026.04.00"
composeBom = "2026.05.01"

[libraries]
androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Thu Feb 29 20:52:44 CST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 2 additions & 1 deletion jetlime/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ kotlin {
}
}

js(IR) {
js {
browser()
binaries.library()
}
Expand Down Expand Up @@ -74,6 +74,7 @@ kotlin {
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.components.uiToolingPreview)
implementation(compose.preview)
api(libs.kotlinx.collections.immutable)
}
desktopMain.dependencies {
Expand Down
31 changes: 28 additions & 3 deletions kotlin-js-store/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2917,7 +2917,16 @@ streamroller@^3.1.5:
debug "^4.3.4"
fs-extra "^8.1.0"

"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down Expand Up @@ -2949,7 +2958,14 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -3305,7 +3321,16 @@ workerpool@^9.2.0:
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-9.3.4.tgz#f6c92395b2141afd78e2a889e80cb338fe9fca41"
integrity sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand Down
10 changes: 4 additions & 6 deletions sample/composeApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {
}

kotlin {
js(IR) {
js {
browser()
binaries.executable()
}
Expand All @@ -27,11 +27,8 @@ kotlin {
outputFileName = "composeApp.js"
devServer =
(devServer ?: KotlinWebpackConfig.DevServer()).apply {
static =
(static ?: mutableListOf()).apply {
// Serve sources to debug inside browser
add(project.projectDir.path)
}
// Serve sources to debug inside browser
static(project.projectDir.path)
}
}
}
Expand Down Expand Up @@ -85,6 +82,7 @@ kotlin {
implementation(compose.components.resources)
implementation(compose.materialIconsExtended)
implementation(compose.components.uiToolingPreview)
implementation(compose.preview)

// Local library
implementation(project(":jetlime"))
Expand Down
4 changes: 2 additions & 2 deletions sample/composeApp/src/commonMain/kotlin/Home.kt
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ fun HomeContent(modifier: Modifier = Modifier) {
@Composable
fun HomeAppBar(
isDarkTheme: Boolean,
modifier: Modifier = Modifier,
onThemeChange: ((Boolean) -> Unit)?,
modifier: Modifier = Modifier,
) {
TopAppBar(
title = {
Expand All @@ -167,7 +167,7 @@ fun HomeAppBar(
)
}

@Preview
@androidx.compose.ui.tooling.preview.Preview
@Composable
private fun PreviewHomeScreen() {
HomeScreen()
Expand Down
Loading