From e139fbb1e468233e6d5a8c56590fc92beadd812c Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Wed, 24 Nov 2021 14:29:49 +0100 Subject: [PATCH] deprecate compose.web.web-widgets in source code and gradle plugin (#1453) * deprecate compose.web.web-widgets in source code and gradle plugin (name alias) * fix typo Co-authored-by: Oleksandr Karpovich --- .../kotlin/org/jetbrains/compose/ComposePlugin.kt | 1 + web/widgets/src/commonMain/kotlin/Alignment.kt | 3 +++ web/widgets/src/commonMain/kotlin/Arrangement.kt | 3 +++ web/widgets/src/commonMain/kotlin/Color.kt | 12 ++++++++++++ web/widgets/src/commonMain/kotlin/Modifier.kt | 4 ++++ web/widgets/src/commonMain/kotlin/layouts/box.kt | 1 + web/widgets/src/commonMain/kotlin/layouts/button.kt | 1 + web/widgets/src/commonMain/kotlin/layouts/column.kt | 1 + .../commonMain/kotlin/layouts/defaults/BoxDefault.kt | 1 + .../kotlin/layouts/defaults/ButtonDefault.kt | 1 + .../kotlin/layouts/defaults/ColumnDefault.kt | 1 + .../kotlin/layouts/defaults/ModifierDefault.kt | 1 + .../commonMain/kotlin/layouts/defaults/RowDefault.kt | 1 + .../kotlin/layouts/defaults/SliderDefault.kt | 1 + .../kotlin/layouts/defaults/TextDefault.kt | 1 + web/widgets/src/commonMain/kotlin/layouts/row.kt | 1 + .../src/commonMain/kotlin/layouts/shapes/shapes.kt | 2 ++ web/widgets/src/commonMain/kotlin/layouts/slider.kt | 1 + web/widgets/src/commonMain/kotlin/layouts/text.kt | 1 + .../src/commonMain/kotlin/modifiers/border.kt | 1 + .../src/commonMain/kotlin/modifiers/clickable.kt | 1 + web/widgets/src/commonMain/kotlin/modifiers/clip.kt | 1 + .../src/commonMain/kotlin/modifiers/fillMaxHeight.kt | 1 + .../src/commonMain/kotlin/modifiers/fillMaxWidth.kt | 1 + .../src/commonMain/kotlin/modifiers/offset.kt | 1 + .../src/commonMain/kotlin/modifiers/onSizeChanged.kt | 1 + web/widgets/src/commonMain/kotlin/modifiers/size.kt | 1 + web/widgets/src/commonMain/kotlin/modifiers/width.kt | 1 + web/widgets/src/commonMain/kotlin/units/Dp.kt | 1 + web/widgets/src/commonMain/kotlin/units/IntSize.kt | 1 + web/widgets/src/commonMain/kotlin/units/TextUnit.kt | 3 +++ .../src/commonMain/kotlin/units/unitConversion.kt | 5 +++++ web/widgets/src/jsMain/kotlin/Modifier.kt | 3 +++ web/widgets/src/jsMain/kotlin/Styles.kt | 1 + .../src/jsMain/kotlin/internal/ActualModifier.kt | 2 ++ web/widgets/src/jsMain/kotlin/layouts/box.kt | 1 + web/widgets/src/jsMain/kotlin/layouts/button.kt | 1 + web/widgets/src/jsMain/kotlin/layouts/column.kt | 1 + web/widgets/src/jsMain/kotlin/layouts/row.kt | 1 + web/widgets/src/jsMain/kotlin/layouts/slider.kt | 1 + web/widgets/src/jsMain/kotlin/layouts/text.kt | 1 + web/widgets/src/jsMain/kotlin/modifiers/border.kt | 1 + web/widgets/src/jsMain/kotlin/modifiers/clickable.kt | 1 + web/widgets/src/jsMain/kotlin/modifiers/clip.kt | 1 + .../src/jsMain/kotlin/modifiers/fillMaxHeight.kt | 1 + .../src/jsMain/kotlin/modifiers/fillMaxWidth.kt | 1 + web/widgets/src/jsMain/kotlin/modifiers/offset.kt | 1 + .../src/jsMain/kotlin/modifiers/onSizeChanged.kt | 1 + web/widgets/src/jsMain/kotlin/modifiers/size.kt | 1 + web/widgets/src/jsMain/kotlin/modifiers/width.kt | 1 + web/widgets/src/jvmMain/kotlin/Alignment.kt | 1 + web/widgets/src/jvmMain/kotlin/Arrangement.kt | 1 + web/widgets/src/jvmMain/kotlin/Color.kt | 1 + web/widgets/src/jvmMain/kotlin/Modifier.kt | 3 +++ .../src/jvmMain/kotlin/internal/ActualModifier.kt | 3 +++ web/widgets/src/jvmMain/kotlin/layouts/box.kt | 1 + web/widgets/src/jvmMain/kotlin/layouts/button.kt | 1 + web/widgets/src/jvmMain/kotlin/layouts/column.kt | 1 + web/widgets/src/jvmMain/kotlin/layouts/row.kt | 1 + .../src/jvmMain/kotlin/layouts/shapes/shapes.kt | 1 + web/widgets/src/jvmMain/kotlin/layouts/slider.kt | 1 + web/widgets/src/jvmMain/kotlin/layouts/text.kt | 1 + web/widgets/src/jvmMain/kotlin/modifiers/border.kt | 1 + .../src/jvmMain/kotlin/modifiers/clickable.kt | 1 + web/widgets/src/jvmMain/kotlin/modifiers/clip.kt | 1 + .../src/jvmMain/kotlin/modifiers/fillMaxHeight.kt | 1 + .../src/jvmMain/kotlin/modifiers/fillMaxWidth.kt | 1 + web/widgets/src/jvmMain/kotlin/modifiers/offset.kt | 1 + .../src/jvmMain/kotlin/modifiers/onSizeChanged.kt | 1 + web/widgets/src/jvmMain/kotlin/modifiers/size.kt | 1 + web/widgets/src/jvmMain/kotlin/modifiers/width.kt | 1 + web/widgets/src/jvmMain/kotlin/units/Dp.kt | 1 + web/widgets/src/jvmMain/kotlin/units/TextUnit.kt | 1 + 73 files changed, 105 insertions(+) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt index ff0456ac13..cd4eb99429 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt @@ -205,6 +205,7 @@ class ComposePlugin : Plugin { composeDependency("org.jetbrains.compose.web:web-svg") } + @Deprecated("compose.web.web-widgets API is deprecated") val widgets by lazy { composeDependency("org.jetbrains.compose.web:web-widgets") } diff --git a/web/widgets/src/commonMain/kotlin/Alignment.kt b/web/widgets/src/commonMain/kotlin/Alignment.kt index 0f85bd5022..c0676a2b69 100644 --- a/web/widgets/src/commonMain/kotlin/Alignment.kt +++ b/web/widgets/src/commonMain/kotlin/Alignment.kt @@ -1,8 +1,11 @@ package org.jetbrains.compose.common.ui @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") interface Alignment { + @Deprecated(message = "compose.web.web-widgets API is deprecated") interface Vertical : Alignment + @Deprecated(message = "compose.web.web-widgets API is deprecated") interface Horizontal : Alignment companion object { diff --git a/web/widgets/src/commonMain/kotlin/Arrangement.kt b/web/widgets/src/commonMain/kotlin/Arrangement.kt index f2f3bf5970..7ae2c9351b 100644 --- a/web/widgets/src/commonMain/kotlin/Arrangement.kt +++ b/web/widgets/src/commonMain/kotlin/Arrangement.kt @@ -3,11 +3,14 @@ package org.jetbrains.compose.common.foundation.layout import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") object Arrangement { @ExperimentalComposeWebWidgetsApi + @Deprecated(message = "compose.web.web-widgets API is deprecated") interface Horizontal @ExperimentalComposeWebWidgetsApi + @Deprecated(message = "compose.web.web-widgets API is deprecated") interface Vertical val End = object : Horizontal {} diff --git a/web/widgets/src/commonMain/kotlin/Color.kt b/web/widgets/src/commonMain/kotlin/Color.kt index acdc34f6ac..3541f35be9 100644 --- a/web/widgets/src/commonMain/kotlin/Color.kt +++ b/web/widgets/src/commonMain/kotlin/Color.kt @@ -3,19 +3,31 @@ package org.jetbrains.compose.common.core.graphics import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") public data class Color(val red: Int, val green: Int, val blue: Int) { companion object { + @Deprecated(message = "compose.web.web-widgets API is deprecated") val Black = Color(0, 0, 0) + @Deprecated(message = "compose.web.web-widgets API is deprecated") val DarkGray = Color(0x44, 0x44, 0x44) + @Deprecated(message = "compose.web.web-widgets API is deprecated") val Gray = Color(0x88, 0x88, 0x88) + @Deprecated(message = "compose.web.web-widgets API is deprecated") val LightGray = Color(0xCC, 0xCC, 0xCC) + @Deprecated(message = "compose.web.web-widgets API is deprecated") val White = Color(0xFF, 0xFF, 0xFF) + @Deprecated(message = "compose.web.web-widgets API is deprecated") val Red = Color(0xFF, 0, 0) + @Deprecated(message = "compose.web.web-widgets API is deprecated") val Green = Color(0, 0xFF, 0) + @Deprecated(message = "compose.web.web-widgets API is deprecated") val Blue = Color(0, 0, 0xFF) + @Deprecated(message = "compose.web.web-widgets API is deprecated") val Yellow = Color(0xFF, 0xFF, 0x00) + @Deprecated(message = "compose.web.web-widgets API is deprecated") val Cyan = Color(0, 0xFF, 0xFF) + @Deprecated(message = "compose.web.web-widgets API is deprecated") val Magenta = Color(0xFF, 0, 0xFF) } } diff --git a/web/widgets/src/commonMain/kotlin/Modifier.kt b/web/widgets/src/commonMain/kotlin/Modifier.kt index 8422f51454..857927c415 100644 --- a/web/widgets/src/commonMain/kotlin/Modifier.kt +++ b/web/widgets/src/commonMain/kotlin/Modifier.kt @@ -4,13 +4,17 @@ import org.jetbrains.compose.common.ui.unit.Dp import org.jetbrains.compose.common.core.graphics.Color @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") interface Modifier { open class Element : Modifier + @Deprecated(message = "compose.web.web-widgets API is deprecated") companion object : Element() } @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") expect fun Modifier.background(color: Color): Modifier @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") expect fun Modifier.padding(all: Dp): Modifier diff --git a/web/widgets/src/commonMain/kotlin/layouts/box.kt b/web/widgets/src/commonMain/kotlin/layouts/box.kt index fab973ad7a..d1d4f631a3 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/box.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/box.kt @@ -6,4 +6,5 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal expect fun BoxActual(modifier: Modifier, content: @Composable () -> Unit) diff --git a/web/widgets/src/commonMain/kotlin/layouts/button.kt b/web/widgets/src/commonMain/kotlin/layouts/button.kt index 3ac0d0a6d5..ff9be56655 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/button.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/button.kt @@ -6,6 +6,7 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal expect fun ButtonActual( modifier: Modifier, onClick: () -> Unit, diff --git a/web/widgets/src/commonMain/kotlin/layouts/column.kt b/web/widgets/src/commonMain/kotlin/layouts/column.kt index fcd19949de..7783310ca6 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/column.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/column.kt @@ -6,4 +6,5 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal expect fun ColumnActual(modifier: Modifier, content: @Composable () -> Unit) diff --git a/web/widgets/src/commonMain/kotlin/layouts/defaults/BoxDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/BoxDefault.kt index 4b50e6c074..0ae8802685 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/defaults/BoxDefault.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/defaults/BoxDefault.kt @@ -6,6 +6,7 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") fun Box( modifier: Modifier = Modifier.Companion, content: @Composable () -> Unit diff --git a/web/widgets/src/commonMain/kotlin/layouts/defaults/ButtonDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/ButtonDefault.kt index 3362ac5fdb..ad22ea1919 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/defaults/ButtonDefault.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/defaults/ButtonDefault.kt @@ -6,6 +6,7 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") fun Button( modifier: Modifier = Modifier.Companion, onClick: () -> Unit, diff --git a/web/widgets/src/commonMain/kotlin/layouts/defaults/ColumnDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/ColumnDefault.kt index 66d3e45176..10d0217ebd 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/defaults/ColumnDefault.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/defaults/ColumnDefault.kt @@ -6,6 +6,7 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") fun Column( modifier: Modifier = Modifier.Companion, content: @Composable () -> Unit diff --git a/web/widgets/src/commonMain/kotlin/layouts/defaults/ModifierDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/ModifierDefault.kt index 18f31742c8..edb5b584a4 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/defaults/ModifierDefault.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/defaults/ModifierDefault.kt @@ -3,6 +3,7 @@ package org.jetbrains.compose.common.ui import org.jetbrains.compose.common.ui.unit.Dp @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") fun Modifier.size(size: Dp): Modifier { return size(size, size) } diff --git a/web/widgets/src/commonMain/kotlin/layouts/defaults/RowDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/RowDefault.kt index 7dc4493de9..50e007b3f2 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/defaults/RowDefault.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/defaults/RowDefault.kt @@ -7,6 +7,7 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") fun Row( modifier: Modifier = Modifier.Companion, horizontalArrangement: Arrangement.Horizontal = Arrangement.Start, diff --git a/web/widgets/src/commonMain/kotlin/layouts/defaults/SliderDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/SliderDefault.kt index 4f5633de2c..6659f3011e 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/defaults/SliderDefault.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/defaults/SliderDefault.kt @@ -6,6 +6,7 @@ import org.jetbrains.compose.common.ui.Modifier @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") fun Slider( value: Float, onValueChange: (Float) -> Unit = {}, diff --git a/web/widgets/src/commonMain/kotlin/layouts/defaults/TextDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/TextDefault.kt index 37812a04c2..7e214257de 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/defaults/TextDefault.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/defaults/TextDefault.kt @@ -8,6 +8,7 @@ import org.jetbrains.compose.common.ui.unit.TextUnit @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") fun Text( text: String, modifier: Modifier = Modifier.Companion, diff --git a/web/widgets/src/commonMain/kotlin/layouts/row.kt b/web/widgets/src/commonMain/kotlin/layouts/row.kt index 574ce08303..2cedf4d081 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/row.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/row.kt @@ -7,6 +7,7 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal expect fun RowActual( modifier: Modifier, horizontalArrangement: Arrangement.Horizontal, diff --git a/web/widgets/src/commonMain/kotlin/layouts/shapes/shapes.kt b/web/widgets/src/commonMain/kotlin/layouts/shapes/shapes.kt index fa63b70f7e..7724d1576b 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/shapes/shapes.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/shapes/shapes.kt @@ -3,7 +3,9 @@ package jetbrains.compose.common.shapes import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") interface Shape @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") object CircleShape : Shape diff --git a/web/widgets/src/commonMain/kotlin/layouts/slider.kt b/web/widgets/src/commonMain/kotlin/layouts/slider.kt index 64768e32fb..05d4e67b76 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/slider.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/slider.kt @@ -6,6 +6,7 @@ import org.jetbrains.compose.common.ui.Modifier @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal expect fun SliderActual( value: Float, onValueChange: (Float) -> Unit, diff --git a/web/widgets/src/commonMain/kotlin/layouts/text.kt b/web/widgets/src/commonMain/kotlin/layouts/text.kt index 32a415516c..6920e1eeb3 100644 --- a/web/widgets/src/commonMain/kotlin/layouts/text.kt +++ b/web/widgets/src/commonMain/kotlin/layouts/text.kt @@ -8,6 +8,7 @@ import org.jetbrains.compose.common.ui.unit.TextUnit @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal expect fun TextActual( text: String, modifier: Modifier, diff --git a/web/widgets/src/commonMain/kotlin/modifiers/border.kt b/web/widgets/src/commonMain/kotlin/modifiers/border.kt index 7eecb46352..92977cefcc 100644 --- a/web/widgets/src/commonMain/kotlin/modifiers/border.kt +++ b/web/widgets/src/commonMain/kotlin/modifiers/border.kt @@ -6,4 +6,5 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi import org.jetbrains.compose.common.ui.Modifier @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") expect fun Modifier.border(size: Dp, color: Color): Modifier diff --git a/web/widgets/src/commonMain/kotlin/modifiers/clickable.kt b/web/widgets/src/commonMain/kotlin/modifiers/clickable.kt index 62885a22a2..7a80f77c9a 100644 --- a/web/widgets/src/commonMain/kotlin/modifiers/clickable.kt +++ b/web/widgets/src/commonMain/kotlin/modifiers/clickable.kt @@ -4,4 +4,5 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi import org.jetbrains.compose.common.ui.Modifier @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") expect fun Modifier.clickable(onClick: () -> Unit): Modifier diff --git a/web/widgets/src/commonMain/kotlin/modifiers/clip.kt b/web/widgets/src/commonMain/kotlin/modifiers/clip.kt index bb692ac68e..61746664b6 100644 --- a/web/widgets/src/commonMain/kotlin/modifiers/clip.kt +++ b/web/widgets/src/commonMain/kotlin/modifiers/clip.kt @@ -5,4 +5,5 @@ import jetbrains.compose.common.shapes.Shape import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") expect fun Modifier.clip(shape: Shape): Modifier diff --git a/web/widgets/src/commonMain/kotlin/modifiers/fillMaxHeight.kt b/web/widgets/src/commonMain/kotlin/modifiers/fillMaxHeight.kt index 3f9d4c8e58..0c3976fa85 100644 --- a/web/widgets/src/commonMain/kotlin/modifiers/fillMaxHeight.kt +++ b/web/widgets/src/commonMain/kotlin/modifiers/fillMaxHeight.kt @@ -4,4 +4,5 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi import org.jetbrains.compose.common.ui.Modifier @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") expect fun Modifier.fillMaxHeight(fraction: Float): Modifier diff --git a/web/widgets/src/commonMain/kotlin/modifiers/fillMaxWidth.kt b/web/widgets/src/commonMain/kotlin/modifiers/fillMaxWidth.kt index 4a245bfcfa..fad6d7dbb1 100644 --- a/web/widgets/src/commonMain/kotlin/modifiers/fillMaxWidth.kt +++ b/web/widgets/src/commonMain/kotlin/modifiers/fillMaxWidth.kt @@ -4,4 +4,5 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi import org.jetbrains.compose.common.ui.Modifier @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") expect fun Modifier.fillMaxWidth(): Modifier diff --git a/web/widgets/src/commonMain/kotlin/modifiers/offset.kt b/web/widgets/src/commonMain/kotlin/modifiers/offset.kt index c2683093aa..e28a655072 100644 --- a/web/widgets/src/commonMain/kotlin/modifiers/offset.kt +++ b/web/widgets/src/commonMain/kotlin/modifiers/offset.kt @@ -5,4 +5,5 @@ import org.jetbrains.compose.common.ui.unit.Dp import org.jetbrains.compose.common.ui.Modifier @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") expect fun Modifier.offset(x: Dp, y: Dp): Modifier diff --git a/web/widgets/src/commonMain/kotlin/modifiers/onSizeChanged.kt b/web/widgets/src/commonMain/kotlin/modifiers/onSizeChanged.kt index 3f5656bc0a..6a1c1c766b 100644 --- a/web/widgets/src/commonMain/kotlin/modifiers/onSizeChanged.kt +++ b/web/widgets/src/commonMain/kotlin/modifiers/onSizeChanged.kt @@ -5,6 +5,7 @@ import org.jetbrains.compose.common.ui.Modifier import org.jetbrains.compose.common.ui.unit.IntSize @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") expect fun Modifier.onSizeChanged( onSizeChanged: (IntSize) -> Unit ): Modifier diff --git a/web/widgets/src/commonMain/kotlin/modifiers/size.kt b/web/widgets/src/commonMain/kotlin/modifiers/size.kt index 2aee8c9cc1..5cac3f1382 100644 --- a/web/widgets/src/commonMain/kotlin/modifiers/size.kt +++ b/web/widgets/src/commonMain/kotlin/modifiers/size.kt @@ -3,4 +3,5 @@ package org.jetbrains.compose.common.ui import org.jetbrains.compose.common.ui.unit.Dp @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") expect fun Modifier.size(width: Dp, height: Dp): Modifier diff --git a/web/widgets/src/commonMain/kotlin/modifiers/width.kt b/web/widgets/src/commonMain/kotlin/modifiers/width.kt index 6f038b2aa4..56a85a280c 100644 --- a/web/widgets/src/commonMain/kotlin/modifiers/width.kt +++ b/web/widgets/src/commonMain/kotlin/modifiers/width.kt @@ -5,4 +5,5 @@ import org.jetbrains.compose.common.ui.unit.Dp import org.jetbrains.compose.common.ui.Modifier @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") expect fun Modifier.width(size: Dp): Modifier diff --git a/web/widgets/src/commonMain/kotlin/units/Dp.kt b/web/widgets/src/commonMain/kotlin/units/Dp.kt index e27e3beb7d..ccaf1115a4 100644 --- a/web/widgets/src/commonMain/kotlin/units/Dp.kt +++ b/web/widgets/src/commonMain/kotlin/units/Dp.kt @@ -3,4 +3,5 @@ package org.jetbrains.compose.common.ui.unit import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") data class Dp(val value: Float) diff --git a/web/widgets/src/commonMain/kotlin/units/IntSize.kt b/web/widgets/src/commonMain/kotlin/units/IntSize.kt index 6b5993408c..15a2c8e1c4 100644 --- a/web/widgets/src/commonMain/kotlin/units/IntSize.kt +++ b/web/widgets/src/commonMain/kotlin/units/IntSize.kt @@ -3,4 +3,5 @@ package org.jetbrains.compose.common.ui.unit import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") data class IntSize(val width: Int, val height: Int) diff --git a/web/widgets/src/commonMain/kotlin/units/TextUnit.kt b/web/widgets/src/commonMain/kotlin/units/TextUnit.kt index ca5fc8f15b..9e8309809f 100644 --- a/web/widgets/src/commonMain/kotlin/units/TextUnit.kt +++ b/web/widgets/src/commonMain/kotlin/units/TextUnit.kt @@ -3,6 +3,7 @@ package org.jetbrains.compose.common.ui.unit import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") enum class TextUnitType { Unspecified, Em, @@ -10,8 +11,10 @@ enum class TextUnitType { } @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") data class TextUnit(val value: Float, val unitType: TextUnitType) { companion object { + @Deprecated(message = "compose.web.web-widgets API is deprecated") val Unspecified = TextUnit(Float.NaN, TextUnitType.Unspecified) } } diff --git a/web/widgets/src/commonMain/kotlin/units/unitConversion.kt b/web/widgets/src/commonMain/kotlin/units/unitConversion.kt index 12d4828d82..7bc166c5b8 100644 --- a/web/widgets/src/commonMain/kotlin/units/unitConversion.kt +++ b/web/widgets/src/commonMain/kotlin/units/unitConversion.kt @@ -4,21 +4,26 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi // TODO: this have to be in a separate package otherwise there's an error for in cross-module usage (for JVM target) @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") val Int.dp: Dp get() = Dp(this.toFloat()) @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") val Int.em: TextUnit get() = TextUnit(toFloat(), TextUnitType.Em) @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") val Float.em: TextUnit get() = TextUnit(this, TextUnitType.Em) @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") val Int.sp: TextUnit get() = TextUnit(toFloat(), TextUnitType.Sp) @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") val Float.sp: TextUnit get() = TextUnit(this, TextUnitType.Sp) diff --git a/web/widgets/src/jsMain/kotlin/Modifier.kt b/web/widgets/src/jsMain/kotlin/Modifier.kt index bdfc90b359..47600bad1d 100644 --- a/web/widgets/src/jsMain/kotlin/Modifier.kt +++ b/web/widgets/src/jsMain/kotlin/Modifier.kt @@ -10,6 +10,7 @@ import org.jetbrains.compose.common.internal.castOrCreate import org.jetbrains.compose.web.attributes.AttrsBuilder @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.background(color: Color): Modifier = castOrCreate().apply { add { backgroundColor(RGB(color.red, color.green, color.blue)) @@ -17,6 +18,7 @@ actual fun Modifier.background(color: Color): Modifier = castOrCreate().apply { } @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") fun Modifier.asAttributeBuilderApplier( passThroughHandler: (AttrsBuilder<*>.() -> Unit)? = null ): AttrsBuilder<*>.() -> Unit = @@ -35,6 +37,7 @@ fun Modifier.asAttributeBuilderApplier( } @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.padding(all: Dp): Modifier = castOrCreate().apply { // yes, it's not a typo, what Modifier.padding does is actually adding margin add { diff --git a/web/widgets/src/jsMain/kotlin/Styles.kt b/web/widgets/src/jsMain/kotlin/Styles.kt index 1e883a2a5d..f7a629ae1f 100644 --- a/web/widgets/src/jsMain/kotlin/Styles.kt +++ b/web/widgets/src/jsMain/kotlin/Styles.kt @@ -13,6 +13,7 @@ import org.jetbrains.compose.web.css.px import org.jetbrains.compose.web.css.StyleSheet +@Deprecated(message = "compose.web.web-widgets API is deprecated") object Styles : StyleSheet() { val columnClass = "compose-web-column" diff --git a/web/widgets/src/jsMain/kotlin/internal/ActualModifier.kt b/web/widgets/src/jsMain/kotlin/internal/ActualModifier.kt index 2036486b3e..8ab4a1ff3b 100644 --- a/web/widgets/src/jsMain/kotlin/internal/ActualModifier.kt +++ b/web/widgets/src/jsMain/kotlin/internal/ActualModifier.kt @@ -6,6 +6,7 @@ import org.jetbrains.compose.web.css.StyleBuilder import org.jetbrains.compose.web.attributes.AttrsBuilder @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") class ActualModifier : Modifier { val styleHandlers = mutableListOf Unit>() val attrHandlers = mutableListOf.() -> Unit>() @@ -20,4 +21,5 @@ class ActualModifier : Modifier { } @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") fun Modifier.castOrCreate(): ActualModifier = (this as? ActualModifier) ?: ActualModifier() diff --git a/web/widgets/src/jsMain/kotlin/layouts/box.kt b/web/widgets/src/jsMain/kotlin/layouts/box.kt index c39e5d958e..f778d5c85d 100644 --- a/web/widgets/src/jsMain/kotlin/layouts/box.kt +++ b/web/widgets/src/jsMain/kotlin/layouts/box.kt @@ -8,6 +8,7 @@ import org.jetbrains.compose.common.ui.asAttributeBuilderApplier @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal actual fun BoxActual(modifier: Modifier, content: @Composable () -> Unit) { Div( attrs = modifier.asAttributeBuilderApplier() diff --git a/web/widgets/src/jsMain/kotlin/layouts/button.kt b/web/widgets/src/jsMain/kotlin/layouts/button.kt index 8a80b02c2b..a0da9a5a34 100644 --- a/web/widgets/src/jsMain/kotlin/layouts/button.kt +++ b/web/widgets/src/jsMain/kotlin/layouts/button.kt @@ -7,6 +7,7 @@ import org.jetbrains.compose.web.dom.Button @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun ButtonActual( modifier: Modifier, onClick: () -> Unit, diff --git a/web/widgets/src/jsMain/kotlin/layouts/column.kt b/web/widgets/src/jsMain/kotlin/layouts/column.kt index 3a5a2e5a4f..c8147ab8b0 100644 --- a/web/widgets/src/jsMain/kotlin/layouts/column.kt +++ b/web/widgets/src/jsMain/kotlin/layouts/column.kt @@ -8,6 +8,7 @@ import org.jetbrains.compose.web.ui.Styles @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal actual fun ColumnActual(modifier: Modifier, content: @Composable () -> Unit) { Div( attrs = { diff --git a/web/widgets/src/jsMain/kotlin/layouts/row.kt b/web/widgets/src/jsMain/kotlin/layouts/row.kt index e55d5ffab1..4bd8ebd054 100644 --- a/web/widgets/src/jsMain/kotlin/layouts/row.kt +++ b/web/widgets/src/jsMain/kotlin/layouts/row.kt @@ -22,6 +22,7 @@ private fun Alignment.Vertical.asClassName() = when (this) { @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal actual fun RowActual( modifier: Modifier, horizontalArrangement: Arrangement.Horizontal, diff --git a/web/widgets/src/jsMain/kotlin/layouts/slider.kt b/web/widgets/src/jsMain/kotlin/layouts/slider.kt index a40f998c19..17e2b37239 100644 --- a/web/widgets/src/jsMain/kotlin/layouts/slider.kt +++ b/web/widgets/src/jsMain/kotlin/layouts/slider.kt @@ -9,6 +9,7 @@ import org.jetbrains.compose.web.attributes.value @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun SliderActual( value: Float, onValueChange: (Float) -> Unit, diff --git a/web/widgets/src/jsMain/kotlin/layouts/text.kt b/web/widgets/src/jsMain/kotlin/layouts/text.kt index a4a6a38ed4..50f7828ff8 100644 --- a/web/widgets/src/jsMain/kotlin/layouts/text.kt +++ b/web/widgets/src/jsMain/kotlin/layouts/text.kt @@ -18,6 +18,7 @@ import org.jetbrains.compose.web.css.px @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal actual fun TextActual( text: String, modifier: Modifier, diff --git a/web/widgets/src/jsMain/kotlin/modifiers/border.kt b/web/widgets/src/jsMain/kotlin/modifiers/border.kt index fa4611fb8e..0863604401 100644 --- a/web/widgets/src/jsMain/kotlin/modifiers/border.kt +++ b/web/widgets/src/jsMain/kotlin/modifiers/border.kt @@ -11,6 +11,7 @@ import org.jetbrains.compose.web.css.border import org.jetbrains.compose.web.css.Color.RGB @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.border(size: Dp, color: Color): Modifier = castOrCreate().apply { add { border(size.value.px, LineStyle.Solid, RGB(color.red, color.green, color.blue)) diff --git a/web/widgets/src/jsMain/kotlin/modifiers/clickable.kt b/web/widgets/src/jsMain/kotlin/modifiers/clickable.kt index aaccf54ff0..e74738e1b5 100644 --- a/web/widgets/src/jsMain/kotlin/modifiers/clickable.kt +++ b/web/widgets/src/jsMain/kotlin/modifiers/clickable.kt @@ -5,6 +5,7 @@ import org.jetbrains.compose.common.internal.castOrCreate import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.clickable(onClick: () -> Unit): Modifier = castOrCreate().apply { addAttributeBuilder { onClick { onClick() } diff --git a/web/widgets/src/jsMain/kotlin/modifiers/clip.kt b/web/widgets/src/jsMain/kotlin/modifiers/clip.kt index b0b5db130f..d796deec19 100644 --- a/web/widgets/src/jsMain/kotlin/modifiers/clip.kt +++ b/web/widgets/src/jsMain/kotlin/modifiers/clip.kt @@ -9,6 +9,7 @@ import org.jetbrains.compose.web.css.borderRadius import org.jetbrains.compose.web.css.percent @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.clip(shape: Shape): Modifier = castOrCreate().apply { when (shape) { CircleShape -> add { diff --git a/web/widgets/src/jsMain/kotlin/modifiers/fillMaxHeight.kt b/web/widgets/src/jsMain/kotlin/modifiers/fillMaxHeight.kt index fddfb6aff8..163baf9dd9 100644 --- a/web/widgets/src/jsMain/kotlin/modifiers/fillMaxHeight.kt +++ b/web/widgets/src/jsMain/kotlin/modifiers/fillMaxHeight.kt @@ -7,6 +7,7 @@ import org.jetbrains.compose.web.css.height import org.jetbrains.compose.web.css.percent @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.fillMaxHeight(fraction: Float): Modifier = castOrCreate().apply { add { height((100 * fraction).percent) diff --git a/web/widgets/src/jsMain/kotlin/modifiers/fillMaxWidth.kt b/web/widgets/src/jsMain/kotlin/modifiers/fillMaxWidth.kt index 2565d7f951..5e5a8ed658 100644 --- a/web/widgets/src/jsMain/kotlin/modifiers/fillMaxWidth.kt +++ b/web/widgets/src/jsMain/kotlin/modifiers/fillMaxWidth.kt @@ -7,6 +7,7 @@ import org.jetbrains.compose.web.css.width import org.jetbrains.compose.web.css.percent @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.fillMaxWidth(): Modifier = castOrCreate().apply { add { width(100.percent) diff --git a/web/widgets/src/jsMain/kotlin/modifiers/offset.kt b/web/widgets/src/jsMain/kotlin/modifiers/offset.kt index 9140047056..64b0b4e490 100644 --- a/web/widgets/src/jsMain/kotlin/modifiers/offset.kt +++ b/web/widgets/src/jsMain/kotlin/modifiers/offset.kt @@ -9,6 +9,7 @@ import org.jetbrains.compose.web.css.marginLeft import org.jetbrains.compose.web.css.px @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.offset(x: Dp, y: Dp): Modifier = castOrCreate().apply { add { marginLeft(x.value.px) diff --git a/web/widgets/src/jsMain/kotlin/modifiers/onSizeChanged.kt b/web/widgets/src/jsMain/kotlin/modifiers/onSizeChanged.kt index 1ebd302d2b..210e6e9227 100644 --- a/web/widgets/src/jsMain/kotlin/modifiers/onSizeChanged.kt +++ b/web/widgets/src/jsMain/kotlin/modifiers/onSizeChanged.kt @@ -5,6 +5,7 @@ import org.jetbrains.compose.common.ui.Modifier import org.jetbrains.compose.common.ui.unit.IntSize @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.onSizeChanged( onSizeChanged: (IntSize) -> Unit ): Modifier { diff --git a/web/widgets/src/jsMain/kotlin/modifiers/size.kt b/web/widgets/src/jsMain/kotlin/modifiers/size.kt index e5979fcb37..6a6f342d88 100644 --- a/web/widgets/src/jsMain/kotlin/modifiers/size.kt +++ b/web/widgets/src/jsMain/kotlin/modifiers/size.kt @@ -7,6 +7,7 @@ import org.jetbrains.compose.web.css.px import org.jetbrains.compose.common.internal.castOrCreate @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.size(width: Dp, height: Dp): Modifier = castOrCreate().apply { add { width(width.value.px) diff --git a/web/widgets/src/jsMain/kotlin/modifiers/width.kt b/web/widgets/src/jsMain/kotlin/modifiers/width.kt index e9343ecbb8..2e38d55b2f 100644 --- a/web/widgets/src/jsMain/kotlin/modifiers/width.kt +++ b/web/widgets/src/jsMain/kotlin/modifiers/width.kt @@ -8,6 +8,7 @@ import org.jetbrains.compose.web.css.px import org.jetbrains.compose.web.css.width @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.width(size: Dp): Modifier = castOrCreate().apply { add { width(size.value.px) diff --git a/web/widgets/src/jvmMain/kotlin/Alignment.kt b/web/widgets/src/jvmMain/kotlin/Alignment.kt index 13e866f95b..37afad554a 100644 --- a/web/widgets/src/jvmMain/kotlin/Alignment.kt +++ b/web/widgets/src/jvmMain/kotlin/Alignment.kt @@ -3,6 +3,7 @@ package org.jetbrains.compose.common.ui import androidx.compose.ui.Alignment as JAlignment @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") val Alignment.Vertical.implementation: JAlignment.Vertical get() = when (this) { Alignment.Top -> JAlignment.Top diff --git a/web/widgets/src/jvmMain/kotlin/Arrangement.kt b/web/widgets/src/jvmMain/kotlin/Arrangement.kt index 8b9f6281b1..f09cf5d8e1 100644 --- a/web/widgets/src/jvmMain/kotlin/Arrangement.kt +++ b/web/widgets/src/jvmMain/kotlin/Arrangement.kt @@ -4,6 +4,7 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi import androidx.compose.foundation.layout.Arrangement as JArrangement @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") val Arrangement.Horizontal.implementation: JArrangement.Horizontal get() = when (this) { Arrangement.End -> JArrangement.End diff --git a/web/widgets/src/jvmMain/kotlin/Color.kt b/web/widgets/src/jvmMain/kotlin/Color.kt index 36c8454937..760a5353ad 100644 --- a/web/widgets/src/jvmMain/kotlin/Color.kt +++ b/web/widgets/src/jvmMain/kotlin/Color.kt @@ -4,5 +4,6 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi import androidx.compose.ui.graphics.Color as JColor @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") val Color.implementation get() = JColor(red, green, blue) diff --git a/web/widgets/src/jvmMain/kotlin/Modifier.kt b/web/widgets/src/jvmMain/kotlin/Modifier.kt index 7f7a29945b..8e9716d01d 100644 --- a/web/widgets/src/jvmMain/kotlin/Modifier.kt +++ b/web/widgets/src/jvmMain/kotlin/Modifier.kt @@ -9,15 +9,18 @@ import org.jetbrains.compose.common.internal.castOrCreate import androidx.compose.foundation.layout.padding @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.background(color: Color): Modifier = castOrCreate().apply { modifier = modifier.background(color.implementation) } @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.padding(all: Dp): Modifier = castOrCreate().apply { modifier = modifier.padding(all.implementation) } @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") val Modifier.implementation get() = castOrCreate().modifier diff --git a/web/widgets/src/jvmMain/kotlin/internal/ActualModifier.kt b/web/widgets/src/jvmMain/kotlin/internal/ActualModifier.kt index 3f7834b540..d51cc85cc6 100644 --- a/web/widgets/src/jvmMain/kotlin/internal/ActualModifier.kt +++ b/web/widgets/src/jvmMain/kotlin/internal/ActualModifier.kt @@ -4,12 +4,15 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi import androidx.compose.ui.Modifier as JModifier import org.jetbrains.compose.common.ui.Modifier +@Deprecated(message = "compose.web.web-widgets API is deprecated") private class ModifierElement : JModifier.Element @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") class ActualModifier : Modifier { var modifier: JModifier = ModifierElement() } @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") fun Modifier.castOrCreate(): ActualModifier = (this as? ActualModifier) ?: ActualModifier() diff --git a/web/widgets/src/jvmMain/kotlin/layouts/box.kt b/web/widgets/src/jvmMain/kotlin/layouts/box.kt index 042118185b..fc904e7115 100644 --- a/web/widgets/src/jvmMain/kotlin/layouts/box.kt +++ b/web/widgets/src/jvmMain/kotlin/layouts/box.kt @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Box as JBox @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal actual fun BoxActual(modifier: Modifier, content: @Composable () -> Unit) { JBox(modifier.implementation) { content.invoke() diff --git a/web/widgets/src/jvmMain/kotlin/layouts/button.kt b/web/widgets/src/jvmMain/kotlin/layouts/button.kt index 6bbbd7d42b..07b78e933d 100644 --- a/web/widgets/src/jvmMain/kotlin/layouts/button.kt +++ b/web/widgets/src/jvmMain/kotlin/layouts/button.kt @@ -8,6 +8,7 @@ import androidx.compose.material.Button as JButton @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal actual fun ButtonActual( modifier: Modifier, onClick: () -> Unit, diff --git a/web/widgets/src/jvmMain/kotlin/layouts/column.kt b/web/widgets/src/jvmMain/kotlin/layouts/column.kt index 65d3f8fe8c..6768710fb6 100644 --- a/web/widgets/src/jvmMain/kotlin/layouts/column.kt +++ b/web/widgets/src/jvmMain/kotlin/layouts/column.kt @@ -8,6 +8,7 @@ import org.jetbrains.compose.common.ui.implementation @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal actual fun ColumnActual(modifier: Modifier, content: @Composable () -> Unit) { JColumn(modifier = modifier.implementation) { content.invoke() diff --git a/web/widgets/src/jvmMain/kotlin/layouts/row.kt b/web/widgets/src/jvmMain/kotlin/layouts/row.kt index e9b1763edc..9551c2fa3e 100644 --- a/web/widgets/src/jvmMain/kotlin/layouts/row.kt +++ b/web/widgets/src/jvmMain/kotlin/layouts/row.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Row as JRow @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal actual fun RowActual( modifier: Modifier, horizontalArrangement: Arrangement.Horizontal, diff --git a/web/widgets/src/jvmMain/kotlin/layouts/shapes/shapes.kt b/web/widgets/src/jvmMain/kotlin/layouts/shapes/shapes.kt index 77e69723ad..ffc6b2e253 100644 --- a/web/widgets/src/jvmMain/kotlin/layouts/shapes/shapes.kt +++ b/web/widgets/src/jvmMain/kotlin/layouts/shapes/shapes.kt @@ -5,6 +5,7 @@ import androidx.compose.ui.graphics.Shape as JShape import androidx.compose.foundation.shape.CircleShape as JCircleShape @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") val Shape.implementation: JShape get() = when (this) { CircleShape -> JCircleShape diff --git a/web/widgets/src/jvmMain/kotlin/layouts/slider.kt b/web/widgets/src/jvmMain/kotlin/layouts/slider.kt index 52c9355ce2..cb3fd7a7e7 100644 --- a/web/widgets/src/jvmMain/kotlin/layouts/slider.kt +++ b/web/widgets/src/jvmMain/kotlin/layouts/slider.kt @@ -8,6 +8,7 @@ import org.jetbrains.compose.common.ui.implementation @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal actual fun SliderActual( value: Float, onValueChange: (Float) -> Unit, diff --git a/web/widgets/src/jvmMain/kotlin/layouts/text.kt b/web/widgets/src/jvmMain/kotlin/layouts/text.kt index fd969d9833..5c148c1b45 100644 --- a/web/widgets/src/jvmMain/kotlin/layouts/text.kt +++ b/web/widgets/src/jvmMain/kotlin/layouts/text.kt @@ -12,6 +12,7 @@ import org.jetbrains.compose.common.ui.unit.implementation @Composable @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") internal actual fun TextActual( text: String, modifier: Modifier, diff --git a/web/widgets/src/jvmMain/kotlin/modifiers/border.kt b/web/widgets/src/jvmMain/kotlin/modifiers/border.kt index fc05a618da..c7b2c31187 100644 --- a/web/widgets/src/jvmMain/kotlin/modifiers/border.kt +++ b/web/widgets/src/jvmMain/kotlin/modifiers/border.kt @@ -10,6 +10,7 @@ import androidx.compose.foundation.border import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.border(size: Dp, color: Color): Modifier = castOrCreate().apply { modifier = modifier.border(size.implementation, color.implementation) } diff --git a/web/widgets/src/jvmMain/kotlin/modifiers/clickable.kt b/web/widgets/src/jvmMain/kotlin/modifiers/clickable.kt index 39e88f85fe..57c11b7b85 100644 --- a/web/widgets/src/jvmMain/kotlin/modifiers/clickable.kt +++ b/web/widgets/src/jvmMain/kotlin/modifiers/clickable.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.clickable import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.clickable(onClick: () -> Unit): Modifier = castOrCreate().apply { modifier = modifier.clickable(onClick = onClick) } diff --git a/web/widgets/src/jvmMain/kotlin/modifiers/clip.kt b/web/widgets/src/jvmMain/kotlin/modifiers/clip.kt index 582781dcd9..97e9639e94 100644 --- a/web/widgets/src/jvmMain/kotlin/modifiers/clip.kt +++ b/web/widgets/src/jvmMain/kotlin/modifiers/clip.kt @@ -8,6 +8,7 @@ import androidx.compose.ui.draw.clip import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.clip(shape: Shape): Modifier = castOrCreate().apply { modifier = modifier.clip(shape.implementation) } diff --git a/web/widgets/src/jvmMain/kotlin/modifiers/fillMaxHeight.kt b/web/widgets/src/jvmMain/kotlin/modifiers/fillMaxHeight.kt index a4309f8b3b..20d9da48c2 100644 --- a/web/widgets/src/jvmMain/kotlin/modifiers/fillMaxHeight.kt +++ b/web/widgets/src/jvmMain/kotlin/modifiers/fillMaxHeight.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.fillMaxHeight import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.fillMaxHeight(fraction: Float): Modifier = castOrCreate().apply { modifier = modifier.fillMaxHeight(fraction) } diff --git a/web/widgets/src/jvmMain/kotlin/modifiers/fillMaxWidth.kt b/web/widgets/src/jvmMain/kotlin/modifiers/fillMaxWidth.kt index e3936d2759..792fea1ade 100644 --- a/web/widgets/src/jvmMain/kotlin/modifiers/fillMaxWidth.kt +++ b/web/widgets/src/jvmMain/kotlin/modifiers/fillMaxWidth.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.fillMaxWidth(): Modifier = castOrCreate().apply { modifier = modifier.fillMaxWidth() } diff --git a/web/widgets/src/jvmMain/kotlin/modifiers/offset.kt b/web/widgets/src/jvmMain/kotlin/modifiers/offset.kt index 181603469d..52b0665ca7 100644 --- a/web/widgets/src/jvmMain/kotlin/modifiers/offset.kt +++ b/web/widgets/src/jvmMain/kotlin/modifiers/offset.kt @@ -8,6 +8,7 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi import org.jetbrains.compose.common.ui.unit.implementation @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.offset(x: Dp, y: Dp): Modifier = castOrCreate().apply { modifier = modifier.offset(x.implementation, y.implementation) } diff --git a/web/widgets/src/jvmMain/kotlin/modifiers/onSizeChanged.kt b/web/widgets/src/jvmMain/kotlin/modifiers/onSizeChanged.kt index 141562f472..7a54e4534a 100644 --- a/web/widgets/src/jvmMain/kotlin/modifiers/onSizeChanged.kt +++ b/web/widgets/src/jvmMain/kotlin/modifiers/onSizeChanged.kt @@ -7,6 +7,7 @@ import androidx.compose.ui.layout.onSizeChanged import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.onSizeChanged( onSizeChanged: (IntSize) -> Unit ): Modifier = castOrCreate().apply { diff --git a/web/widgets/src/jvmMain/kotlin/modifiers/size.kt b/web/widgets/src/jvmMain/kotlin/modifiers/size.kt index 8f106b6507..f853b0f55c 100644 --- a/web/widgets/src/jvmMain/kotlin/modifiers/size.kt +++ b/web/widgets/src/jvmMain/kotlin/modifiers/size.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.size import org.jetbrains.compose.common.internal.castOrCreate @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.size(width: Dp, height: Dp): Modifier = castOrCreate().apply { modifier = modifier.size(width.implementation, height.implementation) } diff --git a/web/widgets/src/jvmMain/kotlin/modifiers/width.kt b/web/widgets/src/jvmMain/kotlin/modifiers/width.kt index c14f849625..e536a1c039 100644 --- a/web/widgets/src/jvmMain/kotlin/modifiers/width.kt +++ b/web/widgets/src/jvmMain/kotlin/modifiers/width.kt @@ -8,6 +8,7 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi import org.jetbrains.compose.common.ui.unit.implementation @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") actual fun Modifier.width(size: Dp): Modifier = castOrCreate().apply { modifier = modifier.width(size.implementation) } diff --git a/web/widgets/src/jvmMain/kotlin/units/Dp.kt b/web/widgets/src/jvmMain/kotlin/units/Dp.kt index 3e3c08bb26..9da9816279 100644 --- a/web/widgets/src/jvmMain/kotlin/units/Dp.kt +++ b/web/widgets/src/jvmMain/kotlin/units/Dp.kt @@ -4,5 +4,6 @@ import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi import androidx.compose.ui.unit.Dp as JDp @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") val Dp.implementation: JDp get() = JDp(value) diff --git a/web/widgets/src/jvmMain/kotlin/units/TextUnit.kt b/web/widgets/src/jvmMain/kotlin/units/TextUnit.kt index 032923cb67..f41ac99f11 100644 --- a/web/widgets/src/jvmMain/kotlin/units/TextUnit.kt +++ b/web/widgets/src/jvmMain/kotlin/units/TextUnit.kt @@ -6,6 +6,7 @@ import androidx.compose.ui.unit.sp import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi @ExperimentalComposeWebWidgetsApi +@Deprecated(message = "compose.web.web-widgets API is deprecated") val TextUnit.implementation: JTextUnit get() = when (unitType) { TextUnitType.Em -> (value).em