Fix CI and docs build

Tweaks after #228

.github/workflows/publish-docs.yml

@@ -42,16 +42,23 @@ jobs:
 
  - uses: gradle/gradle-build-action@v3
 
- - run: ./gradlew :dokkaHtmlMultiModule sample:web-wasm:wasmJsBrowserDistribution --no-configuration-cache
+ - run: |
+ ./gradlew --no-configuration-cache \
+ :dokkaHtmlMultiModule \
+ :sample:web:wasmJsBrowserDistribution \
+ :sample:web:jsBrowserDistribution
 
  - name: Build site
  run: mkdocs build
 
  - name: Copy Dokka output to site
  run: cp -r build/dokka/htmlMultiModule/ site/api/
 
- - name: Copy WebAssembly sample to site
- run: cp -r sample/web-wasm/build/dist/wasmJs/productionExecutable/ site/wasmsample/
+ - name: Copy web samples site
+ run: |
+ mkdir -p site/sample
+ cp -r sample/web/build/dist/wasmJs/productionExecutable/ site/sample/wasm/
+ cp -r sample/web/build/dist/js/productionExecutable/ site/sample/js/
 
  - name: Upload artifact
  uses: actions/upload-pages-artifact@v3

.gitignore

@@ -15,6 +15,7 @@ captures
 .idea/tasks.xml
 .idea/modules.xml
 .idea/compiler.xml
+.idea/other.xml
 .idea/jarRepositories.xml
 .idea/deploymentTargetDropDown.xml
 .idea/deploymentTargetSelector.xml

gradle/build-logic/convention/src/main/kotlin/dev/chrisbanes/gradle/MetalavaConventionPlugin.kt

@@ -22,6 +22,10 @@ class MetalavaConventionPlugin : Plugin<Project> {
  .flatMap { it.kotlin.sourceDirectories },
  )
  }
+
+ tasks.named { it.startsWith("metalavaCheckCompatibility") }.configureEach {
+ dependsOn(tasks.named { it.startsWith("generateResourceAccessors") })
+ }
  }
 }
 

gradle/libs.versions.toml

@@ -3,9 +3,10 @@ agp = "8.5.0"
 androidx-benchmark = "1.2.4"
 androidx-test-ext-junit = "1.1.5"
 coil = "3.0.0-alpha06"
-compose-multiplatform = "1.6.10"
+compose-multiplatform = "1.6.11"
+kotlinx-coroutines-swing = "1.8.1"
 ktlint = "1.0.1"
-kotlin = "1.9.23"
+kotlin = "1.9.24"
 ktor = "3.0.0-wasm2"
 metalava = "0.3.5"
 robolectric = "4.12.2"
@@ -40,6 +41,7 @@ androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
 coil-ktor = { module = "io.coil-kt.coil3:coil-network-ktor", version.ref = "coil" }
 
+kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines-swing" }
 ktor-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
 

haze/build.gradle.kts

@@ -54,6 +54,7 @@ kotlin {
  named("wasmJsMain") {
  dependsOn(skikoMain)
  }
+
  named("jsMain") {
  dependsOn(skikoMain)
  }

internal/screenshot-test/src/commonMain/kotlin/dev/chrisbanes/haze/test/Theme.kt

@@ -20,14 +20,14 @@ fun ScreenshotTheme(
  }
 }
 
-@Composable
-fun poppinsFontFamily(): FontFamily = FontFamily(Font(Res.font.poppins_regular))
+val FontFamily.Companion.Poppins: FontFamily
+ @Composable get() = FontFamily(Font(Res.font.poppins_regular))
 
 private val Typography: Typography
  @Composable get() {
  // Eugh, this is gross but there is no defaultFontFamily property in M3
  val default = Typography()
- val fontFamily = poppinsFontFamily()
+ val fontFamily = FontFamily.Poppins
  return Typography(
  displayLarge = default.displayLarge.copy(fontFamily = fontFamily),
  displayMedium = default.displayMedium.copy(fontFamily = fontFamily),

internal/screenshot-test/src/jsMain/kotlin/dev/chrisbanes/haze/test/ScreenshotTest.kt

@@ -0,0 +1,12 @@
+// Copyright 2024, Christopher Banes and the Haze project contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package dev.chrisbanes.haze.test
+
+actual abstract class ScreenshotTest
+
+actual fun ScreenshotTest.runScreenshotTest(
+ block: ScreenshotUiTest.() -> Unit,
+) {
+ // no-op
+}