Merge branch 'dev' into copilot/fix-1e12ff10-bb36-42db-8915-7914dc2c7a25

Author: ShreckYe

README.md

@@ -184,15 +184,6 @@ kotlin {
 
 View [all the artifacts on Maven Central](https://search.maven.org/search?q=g:com.huanshankeji%20AND%20a:compose-multiplatform-*).
 
-This project depends on [Kobweb](https://github.com/varabyte/kobweb) which is not published to Maven Central yet, so you have to add the following Maven repository:
-
-```kotlin
-repositories {
-    mavenCentral()
-    maven("https://us-central1-maven.pkg.dev/varabyte-repos/public")
-}
-```
-
 ### Material Symbols & Icons on JS
 
 See [the corresponding section in Compose HTML Material](https://github.com/huanshankeji/compose-html-material?tab=readme-ov-file#material-symbols--icons) for configuring Material Icons on JS.

buildSrc/build.gradle.kts

@@ -3,18 +3,18 @@ plugins {
 }
 
 repositories {
-    //mavenLocal() // comment out when not needed
+    mavenLocal() // TODO comment out when not needed so the build is always reproducible by others
     gradlePluginPortal()
     google()
     mavenCentral()
 }
 
 dependencies {
-    val kotlinVersion = "2.2.0-RC2"
+    val kotlinVersion = "2.2.20"
     implementation(kotlin("gradle-plugin", kotlinVersion))
     implementation("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion")
-    implementation("org.jetbrains.compose:compose-gradle-plugin:1.8.1")
-    implementation("com.huanshankeji.team:gradle-plugins:0.9.0") // don't use a snapshot version in a main branch
-    implementation("com.android.tools.build:gradle:8.10.1")
-    implementation("com.huanshankeji:common-gradle-dependencies:0.9.0-20241203") // don't use a snapshot version in a main branch
+    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("com.android.tools.build:gradle:8.11.2") // The latest is 8.13.0 but not compatible yet.
+    implementation("com.huanshankeji:common-gradle-dependencies:0.10.0-20250918-SNAPSHOT") // TODO don't use a snapshot version in a main branch
 }

buildSrc/src/main/kotlin/VersionsAndDependencies.kt

@@ -11,8 +11,8 @@ object DependencyVersions {
     // 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.19.2"
-    val huanshankejiComposeHtml = "0.4.0" // don't use a snapshot version in a main branch
+    val kobweb = "0.23.3"
+    val huanshankejiComposeHtml = "0.4.1-SNAPSHOT" // TODO don't use a snapshot version in a main branch
     val kmdc = "0.1.2"
-    val materialSymbols = "0.25.1"
+    val materialSymbols = "0.35.2"
 }

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

@@ -8,10 +8,9 @@ plugins {
 }
 
 repositories {
-    //mavenLocal() // commented out so the build is always reproducible by others // put back if needed when depending on a snapshot
+    mavenLocal() // TODO comment out when not needed so the build is always reproducible by others
     mavenCentral()
     google()
-    maven("https://us-central1-maven.pkg.dev/varabyte-repos/public") // for Kobweb
 }
 
 group = "com.huanshankeji"

common/build.gradle.kts

@@ -1,4 +1,4 @@
-import com.huanshankeji.team.`Shreck Ye`
+import com.huanshankeji.team.ShreckYe
 import com.huanshankeji.team.pomForTeamDefaultOpenSource
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
@@ -74,6 +74,6 @@ publishing.publications.withType<MavenPublication> {
         "Unified Compose Multiplatform common wrappers $FOR_COMPOSE_TARGETS_IN_TITLE",
         "Common wrappers of components (including layouts) and modifiers $FOR_COMPOSE_TARGETS_IN_DESCRIPTION"
     ) {
-        `Shreck Ye`()
+        ShreckYe()
     }
 }

common/legacy/build.gradle.kts

@@ -34,7 +34,7 @@ publishing.publications.withType<MavenPublication> {
                 "This legacy module depends on `com.huanshankeji:compose-html-common` instead of Kobweb Silk " +
                 "and its components use the `ModifierOrAttrsScope` class to configure styles."
     ) {
-        `Shreck Ye`()
+        ShreckYe()
     }
 }
 */

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell