Merge branch 'main' into release

v0.2.1 release

There are no functional changes. The dependent Compose Multiplatform is bumped to 1.3.1.

Author: ShreckYe

buildSrc/build.gradle.kts

@@ -2,14 +2,23 @@ plugins {
     `kotlin-dsl`
 }
 repositories {
-    //mavenLocal()
+    mavenLocal()
     gradlePluginPortal()
     //maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
 }
 
+val kotlinVersion = "1.8.10"
+val huanshankejiGradlePluginsVersion = "0.4.0"
+
 dependencies {
-    implementation(kotlin("gradle-plugin", "1.7.20"))
-    implementation("org.jetbrains.compose:compose-gradle-plugin:1.2.1")
-    implementation("com.huanshankeji:kotlin-common-gradle-plugins:0.3.2")
-    implementation("com.huanshankeji.team:gradle-plugins:0.3.2")
+    implementation(kotlin("gradle-plugin", kotlinVersion))
+    implementation("org.jetbrains.compose:compose-gradle-plugin:1.3.1")
+    implementation("com.huanshankeji:kotlin-common-gradle-plugins:$huanshankejiGradlePluginsVersion")
+    implementation("com.huanshankeji.team:gradle-plugins:$huanshankejiGradlePluginsVersion")
+}
+
+configurations.all {
+    resolutionStrategy {
+        force("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+    }
 }

buildSrc/src/main/kotlin/Versions.kt

@@ -1,8 +1,8 @@
-const val projectVersion = "0.2.0"
+const val projectVersion = "0.2.1"
 
 object DependencyVersions {
     val webcomponents = "2.6.0"
     val mwc = "0.25.3"
 
     val mdc = "13.0.0"
-}
+}

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

@@ -7,7 +7,7 @@ import org.gradle.kotlin.dsl.*
 plugins {
     id("com.huanshankeji.kotlin-multiplatform-js-browser-conventions")
     id("org.jetbrains.compose")
-    id("com.huanshankeji.sonatype-ossrh-publish")
+    id("com.huanshankeji.kotlin-multiplatform-sonatype-ossrh-publish-conventions")
 }
 
 repositories {
@@ -16,11 +16,3 @@ repositories {
 
 group = "com.huanshankeji"
 version = projectVersion
-
-val javadocJar by tasks.registering(Jar::class) {
-    archiveClassifier.set("javadoc")
-}
-
-publishing.publications.withType<MavenPublication> {
-    artifact(javadocJar)
-}

compose-web-common/build.gradle.kts

@@ -17,7 +17,11 @@ kotlin {
 }
 
 publishing.publications.withType<MavenPublication> {
-    pomForTeamDefaultOpenSource(project, "Huanshankeji Compose for Web common", "Huanshankeji's common code for Compose for Web") {
+    pomForTeamDefaultOpenSource(
+        project,
+        "Huanshankeji Compose for Web common",
+        "Huanshankeji's common code for Compose for Web"
+    ) {
         `Shreck Ye`()
     }
 }

compose-web-common/src/jsMain/kotlin/com/huanshankeji/compose/web/Layouts.kt

@@ -15,6 +15,10 @@ import org.w3c.dom.HTMLDivElement
 
 // try to follow names in Android Jetpack Compose
 
+// TODO: remove these deprecated functions
+
+const val WITH_STYLES_DEPRECATED_MESSAGE = "The functions with `withStyles` suffixes are deprecated."
+
 @Composable
 fun Flexbox(
     attrs: AttrBuilderContext<HTMLDivElement>? = null,
@@ -27,7 +31,8 @@ fun Flexbox(
     } + attrs, content)
 
 @Composable
-fun Flexbox(styles: Styles? = null, content: ContentBuilder<HTMLDivElement>) =
+@Deprecated(WITH_STYLES_DEPRECATED_MESSAGE)
+fun FlexboxS(styles: Styles? = null, content: ContentBuilder<HTMLDivElement>) =
     Flexbox(styles.wrapInAttrs(), content)
 
 @Composable
@@ -44,7 +49,8 @@ fun Column(
     } + attrs, content)
 
 @Composable
-fun Column(styles: Styles? = null, fitContent: Boolean = true, content: ContentBuilder<HTMLDivElement>) =
+@Deprecated(WITH_STYLES_DEPRECATED_MESSAGE)
+fun ColumnS(styles: Styles? = null, fitContent: Boolean = true, content: ContentBuilder<HTMLDivElement>) =
     Column(styles.wrapInAttrs(), fitContent, content)
 
 @Composable
@@ -72,7 +78,8 @@ fun Row(
     } + attrs, content)
 
 @Composable
-fun Row(
+@Deprecated(WITH_STYLES_DEPRECATED_MESSAGE)
+fun RowS(
     styles: Styles? = null,
     content: ContentBuilder<HTMLDivElement>
 ) =

compose-web-material/build.gradle.kts

@@ -39,7 +39,11 @@ kotlin {
 }
 
 publishing.publications.withType<MavenPublication> {
-    pomForTeamDefaultOpenSource(project, "Compose for Web Material", "Some Material components for Compose for Web") {
+    pomForTeamDefaultOpenSource(
+        project,
+        "Compose for Web Material",
+        "Some Material components for Compose for Web"
+    ) {
         `Shreck Ye`()
     }
 }

gradle-plugins/build.gradle.kts

@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("gradle-plugin", "1.7.20"))
+    implementation(kotlin("gradle-plugin"))
 }
 
 
@@ -29,17 +29,15 @@ group = "com.huanshankeji"
 version = projectVersion
 
 gradlePlugin {
+    website.set("https://github.com/huanshankeji/compose-web-material")
+    vcsUrl.set("$website.git")
+
     plugins {
         getByName("com.huanshankeji.compose-web-material-conventions") {
             displayName = "Compose for Web Material conventions"
             description =
                 "This plugin adds the needed Maven dependencies and npm devDependencies (mainly for Webpack) for a Compose for Web project with Material components."
+            tags.set(listOf("kotlin", "kotlin-js", "compose-multiplatform", "compose-web"))
         }
     }
 }
-
-pluginBundle {
-    website = "https://github.com/huanshankeji/compose-web-material"
-    vcsUrl = "$website.git"
-    tags = listOf("kotlin", "compose", "web")
-}

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac