Skip to content

Commit 521c1c9

Browse files
ShreckYeShreckYe
committed
Merge branch 'main' into dev
2 parents f4e2d0a + 7bef7b5 commit 521c1c9

File tree

52 files changed

+3480
-146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3480
-146
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,35 @@
11
name: CI
22

33
on:
4+
workflow_dispatch:
45
push:
5-
branches: [ "*" ]
6+
branches: ["*"]
67
# pull_request:
78
# branches: [ "*" ]
89

910
jobs:
1011
check:
11-
1212
strategy:
1313
matrix:
14-
os: [ ubuntu-latest, macos-latest, windows-latest ]
14+
os: [ubuntu-latest, macos-latest, windows-latest]
1515
runs-on: ${{ matrix.os }}
1616
permissions:
1717
contents: read
1818

1919
steps:
20-
- uses: actions/checkout@v4
21-
- name: Set up JDK 8
22-
uses: actions/setup-java@v4
23-
with:
24-
java-version: '8'
25-
distribution: 'zulu'
26-
- name: Set up JDK 17
27-
uses: actions/setup-java@v4
20+
- uses: huanshankeji/.github/actions/[email protected]
2821
with:
29-
java-version: '17'
30-
distribution: 'temurin'
31-
32-
- name: Setup Gradle
33-
uses: gradle/actions/setup-gradle@v4
34-
35-
- name: Check with Gradle Wrapper
36-
run: ./gradlew check
22+
jdk-versions: 17-temurin
3723

3824
dependency-submission:
39-
4025
strategy:
4126
matrix:
42-
os: [ ubuntu-latest, macos-latest, windows-latest ]
27+
os: [ubuntu-latest, macos-latest, windows-latest]
4328
runs-on: ${{ matrix.os }}
4429
permissions:
4530
contents: write
4631

4732
steps:
48-
- uses: actions/checkout@v4
49-
- name: Set up JDK 17
50-
uses: actions/setup-java@v4
33+
- uses: huanshankeji/.github/actions/[email protected]
5134
with:
52-
java-version: '17'
53-
distribution: 'temurin'
54-
55-
- name: Generate and submit dependency graph
56-
uses: gradle/actions/dependency-submission@v4
35+
jdk-versions: 17-temurin

‎.github/workflows/demo-gh-pages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/configure-pages@v5
3333

3434
- name: Set up JDK 17
35-
uses: actions/setup-java@v4
35+
uses: actions/setup-java@v5
3636
with:
3737
java-version: "17"
3838
distribution: "temurin"

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# Change log
22

3+
## v0.5.0 / 2024-12-05
4+
5+
Important changes:
6+
7+
* This library is renamed from **Compose Multiplatform Material** to **Compose Multiplatform HTML Unified** which better describes its purpose since this release. The **Maven coordinates** have changed accordingly. Please adapt to these changes following the updated README.md.
8+
* replace the terms "Androidx"/"androidx"/"AndroidxCommon"/"androidxCommon" with Compose UI / "ComposeUi" / "composeUi" at appropriate places, both in docs and in code
9+
10+
This introduces some breaking changes. Please adapt accordingly. We are sorry for the inconvenience.
11+
12+
Functional change:
13+
14+
* delegate `Spacer` just to `DivBox` on JS DOM because the Kobweb `Spacer` has a different semantic from the Compose UI one
15+
16+
Miscellaneous changes:
17+
18+
* bump Kotlin to 2.1.0, Compose Multiplatform to 1.7.1, and Kobweb to 0.20.0
19+
* add a "side by side" demo hosted at <https://huanshankeji.github.io/compose-multiplatform-html-unified/>
20+
* add CODE_OF_CONDUCT.md and CONTRIBUTING.md
21+
* use the Kotlin binary compatibility validator
22+
* run IntelliJ IDEA Code Cleanup and Reformat Code for the whole project
23+
324
## v0.4.0 / 2024-10-24
425

526
* fix a bug that a dependent project might crash on Android and add the Android target explicitly for all modules

‎README.md‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ The `com.huanshankeji.compose.material.icons.Icon` class delegates to both kinds
132132

133133
- `outerBorder`
134134
- `roundedCornerBackgroundAndOuterBorder`
135+
- `outerPadding`, `innerPadding`
135136

136137
### Other APIs
137138

@@ -143,15 +144,11 @@ The `com.huanshankeji.compose.material.icons.Icon` class delegates to both kinds
143144

144145
### ViewModel
145146

146-
The ViewModel module currently supports a small subset of the Compose ViewModel APIs, and delegates to raw UI state on
147-
Compose HTML / JS DOM. These APIs are highly experimental now.
147+
The ViewModel module currently supports a subset of the Compose ViewModel APIs. For ViewModel to work properly on Compose HTML / JS DOM, call `com.huanshankeji.compose.ui.window.renderComposableInBodyWithViewModelStoreOwner` instead of `org.jetbrains.compose.web.renderComposableInBody` on JS. These APIs are experimental now.
148148

149149
### Navigation
150150

151-
The navigation module currently supports a small subset of the Compose Navigation APIs, which does not support
152-
transition or animation on Compose HTML / JS DOM. These APIs are also highly experimental now.
153-
See [CMP-4966](https://youtrack.jetbrains.com/issue/CMP-4966) for a bug to avoid. Also, ViewModel-related functions
154-
are not implemented yet on Compose HTML / JS DOM.
151+
The navigation module currently supports a small subset of the Compose Navigation APIs, which does not support transition or animation on Compose HTML / JS DOM. These APIs are also experimental now. See [CMP-4966](https://youtrack.jetbrains.com/issue/CMP-4966) for a bug to avoid.
155152

156153
## Add to your dependencies
157154

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
val androidSdkVersion = 34 // bump to 35 when AGP and Kotlin are bumped
1+
val androidSdkVersion = 35

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
import com.huanshankeji.CommonDependencies
22
import org.jetbrains.compose.ComposeBuildConfig
33

4-
val projectVersion = "0.5.1-SNAPSHOT"
4+
val projectVersion = "0.6.0-SNAPSHOT"
55

66
val commonDependencies = CommonDependencies()
77

88
object DependencyVersions {
99
const val composeMultiplatform = ComposeBuildConfig.composeVersion // for "ui-unit"
10+
11+
// https://slack-chats.kotlinlang.org/t/27579160/after-updating-to-1-8-0-rc01-package-androidx-compose-materi
12+
// https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.8.0-rc01
13+
const val composeMultiplatformMaterialIconsExtended = "1.7.3"
1014
val kobweb = "0.23.3"
1115
val huanshankejiComposeHtml = "0.4.1-SNAPSHOT" // TODO don't use a snapshot version in a main branch
1216
val kmdc = "0.1.2"

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ kotlin {
2121
// for Compose UI
2222

2323
jvm() // TODO: `jvm("desktop")`?
24-
jvmToolchain(8)
24+
jvmToolchain(17)
2525

2626
//androidTarget()
2727

@@ -30,12 +30,17 @@ kotlin {
3030
iosSimulatorArm64()
3131

3232
@OptIn(ExperimentalWasmDsl::class)
33-
wasmJs()
33+
wasmJs {
34+
browser()
35+
}
3436

3537

3638
// for JS and HTML wrappers
3739

38-
js()
40+
js {
41+
// The project works without this, but it can be added to avoid potential issues.
42+
browser()
43+
}
3944

4045

4146

‎common/api/android/compose-multiplatform-html-unified-common.api‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ public final class com/huanshankeji/compose/Content_composeUiKt {
33
public static final fun toNullableContentWithoutModifier (Lkotlin/jvm/functions/Function3;)Lkotlin/jvm/functions/Function2;
44
}
55

6+
public abstract interface annotation class com/huanshankeji/compose/ExperimentalApi : java/lang/annotation/Annotation {
7+
}
8+
69
public abstract interface annotation class com/huanshankeji/compose/ExtRecommendedApi : java/lang/annotation/Annotation {
710
}
811

12+
public abstract interface annotation class com/huanshankeji/compose/LikelyInconsistentApi : java/lang/annotation/Annotation {
13+
}
14+
915
public abstract class com/huanshankeji/compose/ext/LoadingState {
1016
public static final field $stable I
1117
}
@@ -140,7 +146,7 @@ public final class com/huanshankeji/compose/foundation/layout/Arrangement$Vertic
140146
}
141147

142148
public abstract interface class com/huanshankeji/compose/foundation/layout/BoxScope {
143-
public abstract fun align (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;)Lcom/huanshankeji/compose/ui/Modifier;
149+
public fun align (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;)Lcom/huanshankeji/compose/ui/Modifier;
144150
public abstract fun getPlatformBoxScope ()Landroidx/compose/foundation/layout/BoxScope;
145151
}
146152

@@ -174,9 +180,9 @@ public final class com/huanshankeji/compose/foundation/layout/ColumnKt {
174180
}
175181

176182
public abstract interface class com/huanshankeji/compose/foundation/layout/ColumnScope {
177-
public abstract fun align (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment$Horizontal;)Lcom/huanshankeji/compose/ui/Modifier;
183+
public fun align (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment$Horizontal;)Lcom/huanshankeji/compose/ui/Modifier;
178184
public abstract fun getPlatformValue ()Landroidx/compose/foundation/layout/ColumnScope;
179-
public abstract fun weight (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier;
185+
public fun weight (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier;
180186
}
181187

182188
public final class com/huanshankeji/compose/foundation/layout/ColumnScope$DefaultImpls {
@@ -255,9 +261,9 @@ public final class com/huanshankeji/compose/foundation/layout/RowKt {
255261
}
256262

257263
public abstract interface class com/huanshankeji/compose/foundation/layout/RowScope {
258-
public abstract fun align (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment$Vertical;)Lcom/huanshankeji/compose/ui/Modifier;
264+
public fun align (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment$Vertical;)Lcom/huanshankeji/compose/ui/Modifier;
259265
public abstract fun getPlatformValue ()Landroidx/compose/foundation/layout/RowScope;
260-
public abstract fun weight (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier;
266+
public fun weight (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier;
261267
}
262268

263269
public final class com/huanshankeji/compose/foundation/layout/RowScope$DefaultImpls {
@@ -659,10 +665,10 @@ public final class com/huanshankeji/compose/ui/Alignment$Vertical$Impl : com/hua
659665

660666
public abstract interface class com/huanshankeji/compose/ui/Modifier {
661667
public static final field Companion Lcom/huanshankeji/compose/ui/Modifier$Companion;
662-
public abstract fun foldIn (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
668+
public fun foldIn (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
663669
public abstract fun getPlatformModifier ()Landroidx/compose/ui/Modifier;
664-
public abstract fun platformModify (Lkotlin/jvm/functions/Function1;)Lcom/huanshankeji/compose/ui/Modifier;
665-
public abstract fun then (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier;
670+
public fun platformModify (Lkotlin/jvm/functions/Function1;)Lcom/huanshankeji/compose/ui/Modifier;
671+
public fun then (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier;
666672
}
667673

668674
public final class com/huanshankeji/compose/ui/Modifier$Companion : com/huanshankeji/compose/ui/Modifier {

‎common/api/compose-multiplatform-html-unified-common.klib.api‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,18 @@ open annotation class com.huanshankeji.compose.foundation/ExperimentalFoundation
1111
constructor <init>() // com.huanshankeji.compose.foundation/ExperimentalFoundationApi.<init>|<init>(){}[0]
1212
}
1313

14+
open annotation class com.huanshankeji.compose/ExperimentalApi : kotlin/Annotation { // com.huanshankeji.compose/ExperimentalApi|null[0]
15+
constructor <init>() // com.huanshankeji.compose/ExperimentalApi.<init>|<init>(){}[0]
16+
}
17+
1418
open annotation class com.huanshankeji.compose/ExtRecommendedApi : kotlin/Annotation { // com.huanshankeji.compose/ExtRecommendedApi|null[0]
1519
constructor <init>() // com.huanshankeji.compose/ExtRecommendedApi.<init>|<init>(){}[0]
1620
}
1721

22+
open annotation class com.huanshankeji.compose/LikelyInconsistentApi : kotlin/Annotation { // com.huanshankeji.compose/LikelyInconsistentApi|null[0]
23+
constructor <init>() // com.huanshankeji.compose/LikelyInconsistentApi.<init>|<init>(){}[0]
24+
}
25+
1826
final enum class com.huanshankeji.compose.foundation.layout/IntrinsicSize : kotlin/Enum<com.huanshankeji.compose.foundation.layout/IntrinsicSize> { // com.huanshankeji.compose.foundation.layout/IntrinsicSize|null[0]
1927
enum entry Max // com.huanshankeji.compose.foundation.layout/IntrinsicSize.Max|null[0]
2028
enum entry Min // com.huanshankeji.compose.foundation.layout/IntrinsicSize.Min|null[0]
@@ -984,6 +992,14 @@ final enum class com.huanshankeji.browser/Browser : kotlin/Enum<com.huanshankeji
984992
final fun values(): kotlin/Array<com.huanshankeji.browser/Browser> // com.huanshankeji.browser/Browser.values|values#static(){}[0]
985993
}
986994

995+
// Targets: [js]
996+
final class com.huanshankeji.compose.ui.window/SimpleViewModelStoreOwner : androidx.lifecycle/ViewModelStoreOwner { // com.huanshankeji.compose.ui.window/SimpleViewModelStoreOwner|null[0]
997+
constructor <init>() // com.huanshankeji.compose.ui.window/SimpleViewModelStoreOwner.<init>|<init>(){}[0]
998+
999+
final val viewModelStore // com.huanshankeji.compose.ui.window/SimpleViewModelStoreOwner.viewModelStore|{}viewModelStore[0]
1000+
final fun <get-viewModelStore>(): androidx.lifecycle/ViewModelStore // com.huanshankeji.compose.ui.window/SimpleViewModelStoreOwner.viewModelStore.<get-viewModelStore>|<get-viewModelStore>(){}[0]
1001+
}
1002+
9871003
// Targets: [js]
9881004
final object com.huanshankeji.compose.foundation.lazy/LazyItemScope { // com.huanshankeji.compose.foundation.lazy/LazyItemScope|null[0]
9891005
final fun (com.huanshankeji.compose.ui/Modifier).fillParentMaxHeight(kotlin/Float = ...): com.huanshankeji.compose.ui/Modifier // com.huanshankeji.compose.foundation.lazy/LazyItemScope.fillParentMaxHeight|[email protected](kotlin.Float){}[0]
@@ -1020,6 +1036,9 @@ final val com.huanshankeji.compose.foundation/imitateComposeUiLayoutHorizontalSc
10201036
final val com.huanshankeji.compose.foundation/imitateComposeUiLayoutVerticalScrollPlatformModifier // com.huanshankeji.compose.foundation/imitateComposeUiLayoutVerticalScrollPlatformModifier|{}imitateComposeUiLayoutVerticalScrollPlatformModifier[0]
10211037
final fun <get-imitateComposeUiLayoutVerticalScrollPlatformModifier>(): com.varabyte.kobweb.compose.ui/Modifier // com.huanshankeji.compose.foundation/imitateComposeUiLayoutVerticalScrollPlatformModifier.<get-imitateComposeUiLayoutVerticalScrollPlatformModifier>|<get-imitateComposeUiLayoutVerticalScrollPlatformModifier>(){}[0]
10221038

1039+
// Targets: [js]
1040+
final val com.huanshankeji.compose.ui.window/com_huanshankeji_compose_ui_window_SimpleViewModelStoreOwner$stableprop // com.huanshankeji.compose.ui.window/com_huanshankeji_compose_ui_window_SimpleViewModelStoreOwner$stableprop|#static{}com_huanshankeji_compose_ui_window_SimpleViewModelStoreOwner$stableprop[0]
1041+
10231042
// Targets: [js]
10241043
final fun (androidx.compose.ui.unit/Dp).com.huanshankeji.compose.ui.unit/toPx(): org.jetbrains.compose.web.css/CSSSizeValue<org.jetbrains.compose.web.css/CSSUnit.px> // com.huanshankeji.compose.ui.unit/toPx|[email protected](){}[0]
10251044

@@ -1130,3 +1149,12 @@ final fun com.huanshankeji.compose.foundation/com_huanshankeji_compose_foundatio
11301149

11311150
// Targets: [js]
11321151
final fun com.huanshankeji.compose.foundation/rememberScrollState(kotlin/Int, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int): com.huanshankeji.compose.foundation/ScrollState // com.huanshankeji.compose.foundation/rememberScrollState|rememberScrollState(kotlin.Int;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){}[0]
1152+
1153+
// Targets: [js]
1154+
final fun com.huanshankeji.compose.ui.platform/findComposeDefaultViewModelStoreOwner(androidx.compose.runtime/Composer?, kotlin/Int): androidx.lifecycle/ViewModelStoreOwner? // com.huanshankeji.compose.ui.platform/findComposeDefaultViewModelStoreOwner|findComposeDefaultViewModelStoreOwner(androidx.compose.runtime.Composer?;kotlin.Int){}[0]
1155+
1156+
// Targets: [js]
1157+
final fun com.huanshankeji.compose.ui.window/com_huanshankeji_compose_ui_window_SimpleViewModelStoreOwner$stableprop_getter(): kotlin/Int // com.huanshankeji.compose.ui.window/com_huanshankeji_compose_ui_window_SimpleViewModelStoreOwner$stableprop_getter|com_huanshankeji_compose_ui_window_SimpleViewModelStoreOwner$stableprop_getter(){}[0]
1158+
1159+
// Targets: [js]
1160+
final fun com.huanshankeji.compose.ui.window/renderComposableInBodyWithViewModelStoreOwner(kotlin/Function3<org.jetbrains.compose.web.dom/DOMScope<org.w3c.dom/HTMLBodyElement>, androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>): androidx.compose.runtime/Composition // com.huanshankeji.compose.ui.window/renderComposableInBodyWithViewModelStoreOwner|renderComposableInBodyWithViewModelStoreOwner(kotlin.Function3<org.jetbrains.compose.web.dom.DOMScope<org.w3c.dom.HTMLBodyElement>,androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>){}[0]

‎common/api/jvm/compose-multiplatform-html-unified-common.api‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ public final class com/huanshankeji/compose/Content_composeUiKt {
33
public static final fun toNullableContentWithoutModifier (Lkotlin/jvm/functions/Function3;)Lkotlin/jvm/functions/Function2;
44
}
55

6+
public abstract interface annotation class com/huanshankeji/compose/ExperimentalApi : java/lang/annotation/Annotation {
7+
}
8+
69
public abstract interface annotation class com/huanshankeji/compose/ExtRecommendedApi : java/lang/annotation/Annotation {
710
}
811

12+
public abstract interface annotation class com/huanshankeji/compose/LikelyInconsistentApi : java/lang/annotation/Annotation {
13+
}
14+
915
public abstract class com/huanshankeji/compose/ext/LoadingState {
1016
public static final field $stable I
1117
}
@@ -140,7 +146,7 @@ public final class com/huanshankeji/compose/foundation/layout/Arrangement$Vertic
140146
}
141147

142148
public abstract interface class com/huanshankeji/compose/foundation/layout/BoxScope {
143-
public abstract fun align (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;)Lcom/huanshankeji/compose/ui/Modifier;
149+
public fun align (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;)Lcom/huanshankeji/compose/ui/Modifier;
144150
public abstract fun getPlatformBoxScope ()Landroidx/compose/foundation/layout/BoxScope;
145151
}
146152

@@ -174,9 +180,9 @@ public final class com/huanshankeji/compose/foundation/layout/ColumnKt {
174180
}
175181

176182
public abstract interface class com/huanshankeji/compose/foundation/layout/ColumnScope {
177-
public abstract fun align (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment$Horizontal;)Lcom/huanshankeji/compose/ui/Modifier;
183+
public fun align (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment$Horizontal;)Lcom/huanshankeji/compose/ui/Modifier;
178184
public abstract fun getPlatformValue ()Landroidx/compose/foundation/layout/ColumnScope;
179-
public abstract fun weight (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier;
185+
public fun weight (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier;
180186
}
181187

182188
public final class com/huanshankeji/compose/foundation/layout/ColumnScope$DefaultImpls {
@@ -255,9 +261,9 @@ public final class com/huanshankeji/compose/foundation/layout/RowKt {
255261
}
256262

257263
public abstract interface class com/huanshankeji/compose/foundation/layout/RowScope {
258-
public abstract fun align (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment$Vertical;)Lcom/huanshankeji/compose/ui/Modifier;
264+
public fun align (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment$Vertical;)Lcom/huanshankeji/compose/ui/Modifier;
259265
public abstract fun getPlatformValue ()Landroidx/compose/foundation/layout/RowScope;
260-
public abstract fun weight (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier;
266+
public fun weight (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier;
261267
}
262268

263269
public final class com/huanshankeji/compose/foundation/layout/RowScope$DefaultImpls {
@@ -659,10 +665,10 @@ public final class com/huanshankeji/compose/ui/Alignment$Vertical$Impl : com/hua
659665

660666
public abstract interface class com/huanshankeji/compose/ui/Modifier {
661667
public static final field Companion Lcom/huanshankeji/compose/ui/Modifier$Companion;
662-
public abstract fun foldIn (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
668+
public fun foldIn (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
663669
public abstract fun getPlatformModifier ()Landroidx/compose/ui/Modifier;
664-
public abstract fun platformModify (Lkotlin/jvm/functions/Function1;)Lcom/huanshankeji/compose/ui/Modifier;
665-
public abstract fun then (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier;
670+
public fun platformModify (Lkotlin/jvm/functions/Function1;)Lcom/huanshankeji/compose/ui/Modifier;
671+
public fun then (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier;
666672
}
667673

668674
public final class com/huanshankeji/compose/ui/Modifier$Companion : com/huanshankeji/compose/ui/Modifier {

0 commit comments

Comments
 (0)