Merge branch 'main' into release

v0.1.2 release

Author: ShreckYe

README.md

@@ -3,13 +3,12 @@
 [![Maven Central](https://img.shields.io/maven-central/v/com.huanshankeji/compose-multiplatform-material)](https://search.maven.org/artifact/com.huanshankeji/compose-multiplatform-material)
 ![Kotlin version](https://kotlin-version.aws.icerock.dev/kotlin-version?group=com.huanshankeji&name=compose-multiplatform-material)
 
-Some simple Compose Multiplatform wrappers of common components, layouts, and Material Design components for
-desktop/Android and web (mainly based on [KMDC](https://github.com/mpetuska/kmdc))
+Some simple Compose Multiplatform wrappers of common components, layouts, and Material Design components for Android/desktop/iOS (those in `androidx.compose.material`) and Compose HTML (mainly based on [KMDC](https://github.com/mpetuska/kmdc))
 
 We try to make the function types of the composable components follow those of the desktop and Android ones
-in `androidx.compose.foundation` and `androidx.compose.material`, meanwhile being compatible with the Web APIs. However,
+in `androidx.compose.foundation` and `androidx.compose.material`, meanwhile being compatible with the Compose HTML APIs. However,
 only subsets of the composables and composable arguments are supported due to the API differences, limitations of the
-web composables this project depends on, and our limited effort.
+Compose HTML composables this project depends on, and our limited effort.
 
 Visual consistency across different platforms is not guaranteed.
 

buildSrc/build.gradle.kts

@@ -10,9 +10,7 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("gradle-plugin", "1.8.10"))
-    implementation("org.jetbrains.compose:compose-gradle-plugin:1.3.1")
-    implementation("com.huanshankeji.team:gradle-plugins:0.4.0") {
-        exclude("org.jetbrains.kotlin")
-    }
+    implementation(kotlin("gradle-plugin", "1.9.23"))
+    implementation("org.jetbrains.compose:compose-gradle-plugin:1.6.1")
+    implementation("com.huanshankeji.team:gradle-plugins:0.5.1")
 }

buildSrc/src/main/kotlin/VersionsAndDependencies.kt

@@ -1,4 +1,4 @@
 object DependencyVersions {
-    val huanshankejiComposeWeb = "0.2.1"
-    val kmdc = "0.1.0"
+    val huanshankejiComposeWeb = "0.2.2"
+    val kmdc = "0.1.2"
 }

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

@@ -6,4 +6,4 @@ plugins {
 }
 
 group = "com.huanshankeji"
-version = "0.1.1"
+version = "0.1.2"

compose-multiplatform-common/build.gradle.kts

@@ -20,7 +20,7 @@ kotlin {
         }
         named("jsMain") {
             dependencies {
-                implementation(compose.web.core)
+                implementation(compose.html.core)
 
                 api("com.huanshankeji:compose-web-common:${DependencyVersions.huanshankejiComposeWeb}")
             }

demo/build.gradle.kts

@@ -26,6 +26,8 @@ kotlin {
         }
         named("jsMain") {
             dependencies {
+                implementation(compose.html.core)
+
                 // copied from https://github.com/mpetuska/kmdc
 
                 // SCSS dependencies

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists