Merge branch 'main' into github-pages-deployment-with-dokka

Author: ShreckYe

.github/copilot-instructions.md

@@ -0,0 +1,30 @@
+name: "Copilot Setup Steps"
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  pull_request:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+
+jobs:
+  copilot-setup-steps:
+    runs-on: macos-latest
+
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          java-version: "17"
+          distribution: "temurin"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4

.github/workflows/copilot-setup-steps.yml

@@ -0,0 +1 @@
+See [Copilot instructions.md](.github/copilot-instructions.md).

AGENTS.md

@@ -18,6 +18,6 @@ We recommend developing with IntelliJ IDEA. In IntelliJ IDEA, select the correct
 
 Run the `publishToMavenLocal` Gradle task to publish the libraries to your machine's Maven Local Repository so your projects can depend on the changes you have made, run `check` to ensure our limited number of tests pass.
 
-## Furthur notice
+## Further notice
 
 We are currently a small team with limited effort. While we may not always implement your requested features, merge your pull requests, or do such things in time, you are always welcome to create your own fork and make any changes you like.

CONTRIBUTING.md

@@ -51,53 +51,76 @@ This project is still in development and has not reached a stable state. Some AP
 
 #### Material 2 components
 
-- `Button`
-- `Card`
-- `Checkbox`
-- `Divider` (not working properly on JS yet)
-- `Icon`
-- `IconButton`
-- `Snackbar` (inconsistent, not recommended), `SnackBarHost` (recommended)
-- `Switch`
-- `Text`
+**Deprecation notice:** The Material 2 components are no longer maintained and published for release since v0.6.0, due to its decreasing popularity and the underlying KMDC library's incompatible Kotlin and Compose versions.
+
+- Button: `Button`
+- Card: `Card`
+- Checkbox: `Checkbox`
+- Divider: `Divider` (not working properly on JS yet)
+- Icon: `Icon`
+- Icon button: `IconButton`
+- Snackbar: `Snackbar` (inconsistent, not recommended), `SnackBarHost` (recommended)
+- Switch: `Switch`
+- Text: `Text`
 
 ##### `ext` components
 
-- `Button`
-- `IconButton`
-- `RadioRow`, `RadioGroupRow`
-- `SwitchWithLabel`
-- `MaterialText`, `TaglessText`
-- `TextField`, `OutlinedTextField`
-- `TopAppBarScaffold`
+- Button: `Button`
+- Icon button: `IconButton`
+- Radio button: `RadioRow`, `RadioGroupRow`
+- Switch: `SwitchWithLabel`
+- Text: `MaterialText`, `TaglessText`
+- Text field: `TextField`, `OutlinedTextField`
+- Top app bar: `TopAppBarScaffold`
 
 ##### `lazy.ext` components
 
 - `List`/`LazyColumnList` (visually inconsistent for now)
 
 #### Material 3 components
 
-- `Button` (`FilledButton`), `ElevatedButton`, `FilledTonalButton`, `OutlinedButton`, `TextButton`
-- `Card` (`FilledCard`), `ElevatedCard`, `OutlinedCard`
-- `Checkbox`
-- `FloatingActionButton`, `SmallFloatingActionButton`, `LargeFloatingActionButton`, `ExtendedFloatingActionButton`
-- `Icon`
-- `IconButton`, `IconToggleButton`, `FilledIconButton`, `FilledIconToggleButton`, `FilledTonalIconButton`, `FilledTonalIconToggleButton`, `OutlinedIconButton`, `OutlinedIconToggleButton`
-- `LinearProgressIndicator`, `CircularProgressIndicator`
-- `Switch`
-- `Text`
+- Button: `Button` (`FilledButton`), `ElevatedButton`, `FilledTonalButton`, `OutlinedButton`, `TextButton`
+- Card: `Card` (`FilledCard`), `ElevatedCard`, `OutlinedCard`
+- Checkbox: `Checkbox`
+- Dialog: `AlertDialog`, `SimpleDialog`
+- Divider: `HorizontalDivider`
+- Floating action button: `FloatingActionButton`, `SmallFloatingActionButton`, `LargeFloatingActionButton`,
+  `ExtendedFloatingActionButton`
+- Icon: `Icon`
+- Icon button: `IconButton`, `IconToggleButton`, `FilledIconButton`, `FilledIconToggleButton`, `FilledTonalIconButton`,
+  `FilledTonalIconToggleButton`, `OutlinedIconButton`, `OutlinedIconToggleButton`
+- Navigation drawer: `ModalNavigationDrawer` (deprecated)
+- Progress indicator: `LinearProgressIndicator`, `CircularProgressIndicator`
+- Radio button: `RadioButton`
+- Segmented button: `SingleChoiceSegmentedButtonRow`, `MultiChoiceSegmentedButtonRow`
+- Slider: `Slider`, `RangeSlider`
+- Snackbar: `SnackbarHost`, `SnackbarHostState`
+- Switch: `Switch`
+- Tab: `PrimaryTabRow`, `SecondaryTabRow` (tabs are in `ext`)
+- Text: `Text`
 
 ##### `ext` components
 
-- `Button` (`FilledButton`), `ElevatedButton`, `FilledTonalButton`, `OutlinedButton`, `TextButton`
-- `Card` (`FilledCard`), `ElevatedCard`, `OutlinedCard`
-- `DropdownMenu`, `DropdownMenuItem`
-  - `ExposedDropdownMenuBox`, `ExposedDropdownMenuBoxScope.ExposedDropdownMenuBoxTextField`, `ExposedDropdownMenuBoxScope.ExposedDropdownMenu`, `ExposedDropdownMenuWithTextField`
-- `FloatingActionButton`, `SmallFloatingActionButton`, `LargeFloatingActionButton`, `ExtendedFloatingActionButton`
-- `IconButton`, `IconToggleButton`, `FilledIconButton`, `FilledIconToggleButton`, `FilledTonalIconButton`, `FilledTonalIconToggleButton`, `OutlinedIconButton`, `OutlinedIconToggleButton`
-- `NavigationBar`, `NavigationBarItem`
-- `MaterialText`, `TaglessText`
-- `TextField`, `OutlinedTextField`
+- Badge: `Badge` (deprecated)
+- Button: `Button` (`FilledButton`), `ElevatedButton`, `FilledTonalButton`, `OutlinedButton`, `TextButton`
+- Card: `Card` (`FilledCard`), `ElevatedCard`, `OutlinedCard`
+- Chip: `AssistChip`, `ElevatedAssistChip`, `FilterChip`, `ElevatedFilterChip`, `InputChip`, `SuggestionChip`,
+  `ElevatedSuggestionChip`
+- Dropdown menu: `DropdownMenu`, `DropdownMenuItem`
+  - `ExposedDropdownMenuBox`, `ExposedDropdownMenuBoxScope.ExposedDropdownMenuBoxTextField`, `ExposedDropdownMenuBoxScope.ExposedDropdownMenu`, `ExposedDropdownMenuBoxWithTextField`
+- Floating action button: `FloatingActionButton`, `SmallFloatingActionButton`, `LargeFloatingActionButton`,
+  `ExtendedFloatingActionButton`
+- Icon button: `IconButton`, `IconToggleButton`, `FilledIconButton`, `FilledIconToggleButton`, `FilledTonalIconButton`,
+  `FilledTonalIconToggleButton`, `OutlinedIconButton`, `OutlinedIconToggleButton`
+- Navigation bar: `NavigationBar`, `NavigationBarItem`
+- Radio button: `RadioButtonRow`, `radioGroup`
+- Segmented button: `SingleChoiceSegmentedButtonRowScope.SegmentedButton`,
+  `MultiChoiceSegmentedButtonRowScope.SegmentedButton`
+- Select: `FilledSelect`, `OutlinedSelect`, `SelectOption`
+- Tab: `PrimaryTab`, `SecondaryTab`
+- Text: `MaterialText`, `TaglessText`
+- Text field: `TextField`, `OutlinedTextField`
+- Top app bar: `TopAppBar`, `CenterAlignedTopAppBar`, `MediumTopAppBar`, `LargeTopAppBar`
 
 ##### `lazy.ext` components
 

README.md

@@ -10,11 +10,12 @@ repositories {
 }
 
 dependencies {
-    val kotlinVersion = "2.2.10"
+    val kotlinVersion = "2.3.20"
     implementation(kotlin("gradle-plugin", kotlinVersion))
     implementation("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion")
-    implementation("org.jetbrains.compose:compose-gradle-plugin:1.9.0")
-    implementation("com.huanshankeji.team:gradle-plugins:0.10.0-SNAPSHOT") // TODO don't use a snapshot version in a main branch
+    implementation("org.jetbrains.compose:compose-gradle-plugin:1.10.3")
+    implementation("com.huanshankeji.team:gradle-plugins:0.11.0") // don't use a snapshot version in a main branch
+    // https://developer.android.com/build/releases/gradle-plugin, https://mvnrepository.com/artifact/com.android.tools.build/gradle
     implementation("com.android.tools.build:gradle:8.12.3")
-    implementation("com.huanshankeji:common-gradle-dependencies:0.10.0-20250918-SNAPSHOT") // TODO don't use a snapshot version in a main branch
+    implementation("com.huanshankeji:common-gradle-dependencies:0.10.0-20251024") // don't use a snapshot version in a main branch
 }

buildSrc/build.gradle.kts

@@ -8,11 +8,18 @@ val commonDependencies = CommonDependencies()
 object DependencyVersions {
     const val composeMultiplatform = ComposeBuildConfig.composeVersion // for "ui-unit"
 
+
     // https://slack-chats.kotlinlang.org/t/27579160/after-updating-to-1-8-0-rc01-package-androidx-compose-materi
     // https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.8.0-rc01
     const val composeMultiplatformMaterialIconsExtended = "1.7.3"
-    val kobweb = "0.23.3"
-    val huanshankejiComposeHtml = "0.4.1-SNAPSHOT" // TODO don't use a snapshot version in a main branch
+
+    // https://github.com/varabyte/kobweb/releases
+    val kobweb = "0.24.0"
+    val huanshankejiComposeHtml = "0.5.0" // don't use a snapshot version in a main branch
+
+    // https://github.com/mpetuska/kmdc/releases
     val kmdc = "0.1.2"
-    val materialSymbols = "0.35.2"
+
+    // https://github.com/marella/material-symbols/releases
+    val materialSymbols = "0.42.3"
 }

buildSrc/src/main/kotlin/VersionsAndDependencies.kt

@@ -38,6 +38,10 @@ kotlin {
     js {
         // The project works without this, but it can be added to avoid potential issues.
         browser()
+
+        compilerOptions {
+            target.set("es2015")
+        }
     }
 
 
@@ -58,5 +62,6 @@ kotlin {
 
     compilerOptions {
         freeCompilerArgs.add("-Xexpect-actual-classes")
+        optIn.add("com.huanshankeji.compose.ExperimentalApi")
     }
 }

buildSrc/src/main/kotlin/common-conventions.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
     id("lib-conventions-without-publishing")
     id("dokka-convention")
-    id("com.huanshankeji.kotlin-multiplatform-sonatype-ossrh-publish-conventions")
+    id("com.huanshankeji.maven-central-publish-conventions")
 }

buildSrc/src/main/kotlin/lib-conventions.gradle.kts

@@ -1,8 +1,3 @@
-public final class com/huanshankeji/compose/Content_composeUiKt {
-	public static final fun toContentWithoutModifier (Lkotlin/jvm/functions/Function3;)Lkotlin/jvm/functions/Function2;
-	public static final fun toNullableContentWithoutModifier (Lkotlin/jvm/functions/Function3;)Lkotlin/jvm/functions/Function2;
-}
-
 public abstract interface annotation class com/huanshankeji/compose/ExperimentalApi : java/lang/annotation/Annotation {
 }
 
@@ -12,6 +7,11 @@ public abstract interface annotation class com/huanshankeji/compose/ExtRecommend
 public abstract interface annotation class com/huanshankeji/compose/LikelyInconsistentApi : java/lang/annotation/Annotation {
 }
 
+public final class com/huanshankeji/compose/ext/ContentWithModifier_composeUiKt {
+	public static final fun toContentWithoutModifier (Lkotlin/jvm/functions/Function3;)Lkotlin/jvm/functions/Function2;
+	public static final fun toNullableContentWithoutModifier (Lkotlin/jvm/functions/Function3;)Lkotlin/jvm/functions/Function2;
+}
+
 public abstract class com/huanshankeji/compose/ext/LoadingState {
 	public static final field $stable I
 }
@@ -71,9 +71,13 @@ public final class com/huanshankeji/compose/foundation/OnClick_composeUiKt {
 	public static final fun clickable (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function0;)Lcom/huanshankeji/compose/ui/Modifier;
 }
 
-public final class com/huanshankeji/compose/foundation/Scroll_composeUiKt {
+public final class com/huanshankeji/compose/foundation/ScrollKt {
+	public static final field SCROLL_MODIFIER_DEPRECATION_MESSAGE Ljava/lang/String;
 	public static final fun HorizontalScrollBox (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
 	public static final fun VerticalScrollBox (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+}
+
+public final class com/huanshankeji/compose/foundation/Scroll_composeUiKt {
 	public static final fun horizontalScroll (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/foundation/ScrollState;)Lcom/huanshankeji/compose/ui/Modifier;
 	public static final fun rememberScrollState (ILandroidx/compose/runtime/Composer;II)Landroidx/compose/foundation/ScrollState;
 	public static final fun verticalScroll (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/foundation/ScrollState;)Lcom/huanshankeji/compose/ui/Modifier;
@@ -99,6 +103,11 @@ public final class com/huanshankeji/compose/foundation/ext/MatchPositionRelative
 	public static final fun matchPositionRelativeParentJsDom (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier;
 }
 
+public final class com/huanshankeji/compose/foundation/ext/Scroll_composeUiKt {
+	public static final fun HorizontalScrollContainer (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public static final fun VerticalScrollContainer (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+}
+
 public final class com/huanshankeji/compose/foundation/layout/Arrangement {
 	public static final field $stable I
 	public static final field INSTANCE Lcom/huanshankeji/compose/foundation/layout/Arrangement;
@@ -367,6 +376,13 @@ public final class com/huanshankeji/compose/foundation/layout/ext/OuterPadding_c
 	public static synthetic fun outerPadding-qDBjuR0$default (Lcom/huanshankeji/compose/ui/Modifier;FFFFILjava/lang/Object;)Lcom/huanshankeji/compose/ui/Modifier;
 }
 
+public final class com/huanshankeji/compose/foundation/layout/ext/Scroll_composeUiKt {
+	public static final fun HorizontalScrollBox (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HorizontalScrollRow (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/Arrangement$Horizontal;Lcom/huanshankeji/compose/ui/Alignment$Vertical;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public static final fun VerticalScrollBox (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public static final fun VerticalScrollColumn (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/Arrangement$Vertical;Lcom/huanshankeji/compose/ui/Alignment$Horizontal;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+}
+
 public final class com/huanshankeji/compose/foundation/layout/ext/Size_composeUiKt {
 	public static final fun fillMaxHeightStretch (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier;
 	public static final fun fillMaxSizeStretch (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier;
@@ -738,6 +754,10 @@ public final class com/huanshankeji/compose/ui/Modifier$Impl : com/huanshankeji/
 	public final synthetic fun unbox-impl ()Landroidx/compose/ui/Modifier;
 }
 
+public final class com/huanshankeji/compose/ui/Modifier_composeUiKt {
+	public static final fun toCommonModifier (Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;
+}
+
 public final class com/huanshankeji/compose/ui/draw/Alpha_composeUiKt {
 	public static final fun alpha (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier;
 }