Skip to content

Commit 8b1ba29

Browse files
ShreckYeShreckYe
committed
Merge branch 'main' into release
v0.2.1 release There are no functional changes. The dependent Compose Multiplatform is bumped to 1.3.1.
2 parents c233155 + 5711e3f commit 8b1ba29

File tree

12 files changed

+71
-46
lines changed

12 files changed

+71
-46
lines changed

‎buildSrc/build.gradle.kts

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,23 @@ plugins {
22
`kotlin-dsl`
33
}
44
repositories {
5-
//mavenLocal()
5+
mavenLocal()
66
gradlePluginPortal()
77
//maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
88
}
99

10+
val kotlinVersion = "1.8.10"
11+
val huanshankejiGradlePluginsVersion = "0.4.0"
12+
1013
dependencies {
11-
implementation(kotlin("gradle-plugin", "1.7.20"))
12-
implementation("org.jetbrains.compose:compose-gradle-plugin:1.2.1")
13-
implementation("com.huanshankeji:kotlin-common-gradle-plugins:0.3.2")
14-
implementation("com.huanshankeji.team:gradle-plugins:0.3.2")
14+
implementation(kotlin("gradle-plugin", kotlinVersion))
15+
implementation("org.jetbrains.compose:compose-gradle-plugin:1.3.1")
16+
implementation("com.huanshankeji:kotlin-common-gradle-plugins:$huanshankejiGradlePluginsVersion")
17+
implementation("com.huanshankeji.team:gradle-plugins:$huanshankejiGradlePluginsVersion")
18+
}
19+
20+
configurations.all {
21+
resolutionStrategy {
22+
force("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
23+
}
1524
}

‎buildSrc/src/main/kotlin/Versions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
const val projectVersion = "0.2.0"
1+
const val projectVersion = "0.2.1"
22

33
object DependencyVersions {
44
val webcomponents = "2.6.0"
55
val mwc = "0.25.3"
66

77
val mdc = "13.0.0"
8-
}
8+
}

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.gradle.kotlin.dsl.*
77
plugins {
88
id("com.huanshankeji.kotlin-multiplatform-js-browser-conventions")
99
id("org.jetbrains.compose")
10-
id("com.huanshankeji.sonatype-ossrh-publish")
10+
id("com.huanshankeji.kotlin-multiplatform-sonatype-ossrh-publish-conventions")
1111
}
1212

1313
repositories {
@@ -16,11 +16,3 @@ repositories {
1616

1717
group = "com.huanshankeji"
1818
version = projectVersion
19-
20-
val javadocJar by tasks.registering(Jar::class) {
21-
archiveClassifier.set("javadoc")
22-
}
23-
24-
publishing.publications.withType<MavenPublication> {
25-
artifact(javadocJar)
26-
}

‎compose-web-common/build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ kotlin {
1717
}
1818

1919
publishing.publications.withType<MavenPublication> {
20-
pomForTeamDefaultOpenSource(project, "Huanshankeji Compose for Web common", "Huanshankeji's common code for Compose for Web") {
20+
pomForTeamDefaultOpenSource(
21+
project,
22+
"Huanshankeji Compose for Web common",
23+
"Huanshankeji's common code for Compose for Web"
24+
) {
2125
`Shreck Ye`()
2226
}
2327
}

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ import org.w3c.dom.HTMLDivElement
1515

1616
// try to follow names in Android Jetpack Compose
1717

18+
// TODO: remove these deprecated functions
19+
20+
const val WITH_STYLES_DEPRECATED_MESSAGE = "The functions with `withStyles` suffixes are deprecated."
21+
1822
@Composable
1923
fun Flexbox(
2024
attrs: AttrBuilderContext<HTMLDivElement>? = null,
@@ -27,7 +31,8 @@ fun Flexbox(
2731
} + attrs, content)
2832

2933
@Composable
30-
fun Flexbox(styles: Styles? = null, content: ContentBuilder<HTMLDivElement>) =
34+
@Deprecated(WITH_STYLES_DEPRECATED_MESSAGE)
35+
fun FlexboxS(styles: Styles? = null, content: ContentBuilder<HTMLDivElement>) =
3136
Flexbox(styles.wrapInAttrs(), content)
3237

3338
@Composable
@@ -44,7 +49,8 @@ fun Column(
4449
} + attrs, content)
4550

4651
@Composable
47-
fun Column(styles: Styles? = null, fitContent: Boolean = true, content: ContentBuilder<HTMLDivElement>) =
52+
@Deprecated(WITH_STYLES_DEPRECATED_MESSAGE)
53+
fun ColumnS(styles: Styles? = null, fitContent: Boolean = true, content: ContentBuilder<HTMLDivElement>) =
4854
Column(styles.wrapInAttrs(), fitContent, content)
4955

5056
@Composable
@@ -72,7 +78,8 @@ fun Row(
7278
} + attrs, content)
7379

7480
@Composable
75-
fun Row(
81+
@Deprecated(WITH_STYLES_DEPRECATED_MESSAGE)
82+
fun RowS(
7683
styles: Styles? = null,
7784
content: ContentBuilder<HTMLDivElement>
7885
) =

‎compose-web-material/build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ kotlin {
3939
}
4040

4141
publishing.publications.withType<MavenPublication> {
42-
pomForTeamDefaultOpenSource(project, "Compose for Web Material", "Some Material components for Compose for Web") {
42+
pomForTeamDefaultOpenSource(
43+
project,
44+
"Compose for Web Material",
45+
"Some Material components for Compose for Web"
46+
) {
4347
`Shreck Ye`()
4448
}
4549
}

‎gradle-plugins/build.gradle.kts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repositories {
1111
}
1212

1313
dependencies {
14-
implementation(kotlin("gradle-plugin", "1.7.20"))
14+
implementation(kotlin("gradle-plugin"))
1515
}
1616

1717

@@ -29,17 +29,15 @@ group = "com.huanshankeji"
2929
version = projectVersion
3030

3131
gradlePlugin {
32+
website.set("https://github.com/huanshankeji/compose-web-material")
33+
vcsUrl.set("$website.git")
34+
3235
plugins {
3336
getByName("com.huanshankeji.compose-web-material-conventions") {
3437
displayName = "Compose for Web Material conventions"
3538
description =
3639
"This plugin adds the needed Maven dependencies and npm devDependencies (mainly for Webpack) for a Compose for Web project with Material components."
40+
tags.set(listOf("kotlin", "kotlin-js", "compose-multiplatform", "compose-web"))
3741
}
3842
}
3943
}
40-
41-
pluginBundle {
42-
website = "https://github.com/huanshankeji/compose-web-material"
43-
vcsUrl = "$website.git"
44-
tags = listOf("kotlin", "compose", "web")
45-
}

‎gradle/wrapper/gradle-wrapper.jar

852 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

8888
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
8989
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
143143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147+
# shellcheck disable=SC3045
146148
MAX_FD=$( ulimit -H -n ) ||
147149
warn "Could not query maximum file descriptor limit"
148150
esac
149151
case $MAX_FD in #(
150152
'' | soft) :;; #(
151153
*)
154+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155+
# shellcheck disable=SC3045
152156
ulimit -n "$MAX_FD" ||
153157
warn "Could not set maximum file descriptor limit to $MAX_FD"
154158
esac

‎gradlew.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
2828
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

‎kotlin-js-store/yarn.lock

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -865,11 +865,16 @@ acorn-import-assertions@^1.7.6:
865865
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
866866
integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
867867

868-
acorn@^8.4.1, acorn@^8.5.0:
868+
acorn@^8.5.0:
869869
version "8.7.1"
870870
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
871871
integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
872872

873+
acorn@^8.7.1:
874+
version "8.8.2"
875+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
876+
integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
877+
873878
ajv-keywords@^3.5.2:
874879
version "3.5.2"
875880
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
@@ -1242,10 +1247,10 @@ engine.io@~6.2.0:
12421247
engine.io-parser "~5.0.3"
12431248
ws "~8.2.3"
12441249

1245-
enhanced-resolve@^5.9.3:
1246-
version "5.10.0"
1247-
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
1248-
integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
1250+
enhanced-resolve@^5.10.0:
1251+
version "5.12.0"
1252+
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
1253+
integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
12491254
dependencies:
12501255
graceful-fs "^4.2.4"
12511256
tapable "^2.2.0"
@@ -2404,7 +2409,7 @@ void-elements@^2.0.0:
24042409
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
24052410
integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
24062411

2407-
watchpack@^2.3.1:
2412+
watchpack@^2.4.0:
24082413
version "2.4.0"
24092414
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
24102415
integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
@@ -2455,21 +2460,21 @@ webpack-sources@^3.2.3:
24552460
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
24562461
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
24572462

2458-
webpack@5.73.0:
2459-
version "5.73.0"
2460-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38"
2461-
integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==
2463+
webpack@5.74.0:
2464+
version "5.74.0"
2465+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
2466+
integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
24622467
dependencies:
24632468
"@types/eslint-scope" "^3.7.3"
24642469
"@types/estree" "^0.0.51"
24652470
"@webassemblyjs/ast" "1.11.1"
24662471
"@webassemblyjs/wasm-edit" "1.11.1"
24672472
"@webassemblyjs/wasm-parser" "1.11.1"
2468-
acorn "^8.4.1"
2473+
acorn "^8.7.1"
24692474
acorn-import-assertions "^1.7.6"
24702475
browserslist "^4.14.5"
24712476
chrome-trace-event "^1.0.2"
2472-
enhanced-resolve "^5.9.3"
2477+
enhanced-resolve "^5.10.0"
24732478
es-module-lexer "^0.9.0"
24742479
eslint-scope "5.1.1"
24752480
events "^3.2.0"
@@ -2482,7 +2487,7 @@ webpack@5.73.0:
24822487
schema-utils "^3.1.0"
24832488
tapable "^2.1.1"
24842489
terser-webpack-plugin "^5.1.3"
2485-
watchpack "^2.3.1"
2490+
watchpack "^2.4.0"
24862491
webpack-sources "^3.2.3"
24872492

24882493
whatwg-url@^7.0.0:

0 commit comments

Comments
 (0)