From 06a905e63af8ad56329e47e58c80778f876edddf Mon Sep 17 00:00:00 2001 From: Shagen Ogandzhanian Date: Mon, 24 May 2021 22:10:57 +0200 Subject: [PATCH] Split web-core to web-core and web-integration This also means that we have new naming for web artifacts in the gradle plugin --- .../src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt | 6 +++++- web/gradle.properties | 4 ++-- web/integration-widgets/build.gradle.kts | 4 +++- web/settings.gradle.kts | 2 ++ .../withWeb => widgets/src/commonMain/kotlin}/Alignment.kt | 0 .../src/commonMain/kotlin}/Arrangement.kt | 0 .../withWeb => widgets/src/commonMain/kotlin}/Color.kt | 0 .../withWeb => widgets/src/commonMain/kotlin}/Modifier.kt | 0 .../src/commonMain/kotlin}/layouts/box.kt | 0 .../src/commonMain/kotlin}/layouts/button.kt | 0 .../src/commonMain/kotlin}/layouts/column.kt | 0 .../src/commonMain/kotlin}/layouts/defaults/BoxDefault.kt | 0 .../commonMain/kotlin}/layouts/defaults/ButtonDefault.kt | 0 .../commonMain/kotlin}/layouts/defaults/ColumnDefault.kt | 0 .../commonMain/kotlin}/layouts/defaults/ModifierDefault.kt | 0 .../src/commonMain/kotlin}/layouts/defaults/RowDefault.kt | 0 .../commonMain/kotlin}/layouts/defaults/SliderDefault.kt | 0 .../src/commonMain/kotlin}/layouts/defaults/TextDefault.kt | 0 .../src/commonMain/kotlin}/layouts/row.kt | 0 .../src/commonMain/kotlin}/layouts/shapes/shapes.kt | 0 .../src/commonMain/kotlin}/layouts/slider.kt | 0 .../src/commonMain/kotlin}/layouts/text.kt | 0 .../src/commonMain/kotlin}/modifiers/border.kt | 0 .../src/commonMain/kotlin}/modifiers/clickable.kt | 0 .../src/commonMain/kotlin}/modifiers/clip.kt | 0 .../src/commonMain/kotlin}/modifiers/fillMaxHeight.kt | 0 .../src/commonMain/kotlin}/modifiers/fillMaxWidth.kt | 0 .../src/commonMain/kotlin}/modifiers/offset.kt | 0 .../src/commonMain/kotlin}/modifiers/onSizeChanged.kt | 0 .../src/commonMain/kotlin}/modifiers/size.kt | 0 .../src/commonMain/kotlin}/modifiers/width.kt | 0 .../withWeb => widgets/src/commonMain/kotlin}/units/Dp.kt | 0 .../src/commonMain/kotlin}/units/IntSize.kt | 0 .../src/commonMain/kotlin}/units/TextUnit.kt | 0 .../src/commonMain/kotlin}/units/unitConversion.kt | 0 .../withWeb => widgets/src/jsMain/kotlin}/Modifier.kt | 0 .../kotlin/withWeb => widgets/src/jsMain/kotlin}/Styles.kt | 0 .../src/jsMain/kotlin}/internal/ActualModifier.kt | 0 .../withWeb => widgets/src/jsMain/kotlin}/layouts/box.kt | 0 .../withWeb => widgets/src/jsMain/kotlin}/layouts/button.kt | 0 .../withWeb => widgets/src/jsMain/kotlin}/layouts/column.kt | 0 .../withWeb => widgets/src/jsMain/kotlin}/layouts/row.kt | 0 .../withWeb => widgets/src/jsMain/kotlin}/layouts/slider.kt | 0 .../withWeb => widgets/src/jsMain/kotlin}/layouts/text.kt | 0 .../src/jsMain/kotlin}/modifiers/border.kt | 0 .../src/jsMain/kotlin}/modifiers/clickable.kt | 0 .../withWeb => widgets/src/jsMain/kotlin}/modifiers/clip.kt | 0 .../src/jsMain/kotlin}/modifiers/fillMaxHeight.kt | 0 .../src/jsMain/kotlin}/modifiers/fillMaxWidth.kt | 0 .../src/jsMain/kotlin}/modifiers/offset.kt | 0 .../src/jsMain/kotlin}/modifiers/onSizeChanged.kt | 0 .../withWeb => widgets/src/jsMain/kotlin}/modifiers/size.kt | 0 .../src/jsMain/kotlin}/modifiers/width.kt | 0 .../commonApi => widgets/src/jsTest}/ModifierTests.kt | 0 .../withWeb => widgets/src/jvmMain/kotlin}/Alignment.kt | 0 .../withWeb => widgets/src/jvmMain/kotlin}/Arrangement.kt | 0 .../kotlin/withWeb => widgets/src/jvmMain/kotlin}/Color.kt | 0 .../withWeb => widgets/src/jvmMain/kotlin}/Modifier.kt | 0 .../src/jvmMain/kotlin}/internal/ActualModifier.kt | 0 .../withWeb => widgets/src/jvmMain/kotlin}/layouts/box.kt | 0 .../src/jvmMain/kotlin}/layouts/button.kt | 0 .../src/jvmMain/kotlin}/layouts/column.kt | 0 .../withWeb => widgets/src/jvmMain/kotlin}/layouts/row.kt | 0 .../src/jvmMain/kotlin}/layouts/shapes/shapes.kt | 0 .../src/jvmMain/kotlin}/layouts/slider.kt | 0 .../withWeb => widgets/src/jvmMain/kotlin}/layouts/text.kt | 0 .../src/jvmMain/kotlin}/modifiers/border.kt | 0 .../src/jvmMain/kotlin}/modifiers/clickable.kt | 0 .../src/jvmMain/kotlin}/modifiers/clip.kt | 0 .../src/jvmMain/kotlin}/modifiers/fillMaxHeight.kt | 0 .../src/jvmMain/kotlin}/modifiers/fillMaxWidth.kt | 0 .../src/jvmMain/kotlin}/modifiers/offset.kt | 0 .../src/jvmMain/kotlin}/modifiers/onSizeChanged.kt | 0 .../src/jvmMain/kotlin}/modifiers/size.kt | 0 .../src/jvmMain/kotlin}/modifiers/width.kt | 0 .../withWeb => widgets/src/jvmMain/kotlin}/units/Dp.kt | 0 .../src/jvmMain/kotlin}/units/TextUnit.kt | 0 77 files changed, 12 insertions(+), 4 deletions(-) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/Alignment.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/Arrangement.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/Color.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/Modifier.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/box.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/button.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/column.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/defaults/BoxDefault.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/defaults/ButtonDefault.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/defaults/ColumnDefault.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/defaults/ModifierDefault.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/defaults/RowDefault.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/defaults/SliderDefault.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/defaults/TextDefault.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/row.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/shapes/shapes.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/slider.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/layouts/text.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/modifiers/border.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/modifiers/clickable.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/modifiers/clip.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/modifiers/fillMaxHeight.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/modifiers/fillMaxWidth.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/modifiers/offset.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/modifiers/onSizeChanged.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/modifiers/size.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/modifiers/width.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/units/Dp.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/units/IntSize.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/units/TextUnit.kt (100%) rename web/{core/src/commonMain/kotlin/withWeb => widgets/src/commonMain/kotlin}/units/unitConversion.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/Modifier.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/Styles.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/internal/ActualModifier.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/layouts/box.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/layouts/button.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/layouts/column.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/layouts/row.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/layouts/slider.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/layouts/text.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/modifiers/border.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/modifiers/clickable.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/modifiers/clip.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/modifiers/fillMaxHeight.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/modifiers/fillMaxWidth.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/modifiers/offset.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/modifiers/onSizeChanged.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/modifiers/size.kt (100%) rename web/{core/src/jsMain/kotlin/withWeb => widgets/src/jsMain/kotlin}/modifiers/width.kt (100%) rename web/{core/src/jsTest/kotlin/commonApi => widgets/src/jsTest}/ModifierTests.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/Alignment.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/Arrangement.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/Color.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/Modifier.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/internal/ActualModifier.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/layouts/box.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/layouts/button.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/layouts/column.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/layouts/row.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/layouts/shapes/shapes.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/layouts/slider.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/layouts/text.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/modifiers/border.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/modifiers/clickable.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/modifiers/clip.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/modifiers/fillMaxHeight.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/modifiers/fillMaxWidth.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/modifiers/offset.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/modifiers/onSizeChanged.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/modifiers/size.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/modifiers/width.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/units/Dp.kt (100%) rename web/{core/src/jvmMain/kotlin/withWeb => widgets/src/jvmMain/kotlin}/units/TextUnit.kt (100%) 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 2fbb60dcdd..94b4378f27 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 @@ -150,9 +150,13 @@ class ComposePlugin : Plugin { } object WebDependencies { - val web by lazy { + val core by lazy { composeDependency("org.jetbrains.compose.web:web-core") } + + val widgets by lazy { + composeDependency("org.jetbrains.compose.web:web-widgets") + } } } diff --git a/web/gradle.properties b/web/gradle.properties index 9d06a6d47c..49b0ea1bc3 100644 --- a/web/gradle.properties +++ b/web/gradle.properties @@ -1,2 +1,2 @@ -COMPOSE_CORE_VERSION = 0.0.10-SNAPSHOT -COMPOSE_WEB_VERSION = 0.0.10-SNAPSHOT +COMPOSE_CORE_VERSION = 0.0.11-SNAPSHOT +COMPOSE_WEB_VERSION = 0.0.11-SNAPSHOT diff --git a/web/integration-widgets/build.gradle.kts b/web/integration-widgets/build.gradle.kts index 769854db4f..1610057b28 100644 --- a/web/integration-widgets/build.gradle.kts +++ b/web/integration-widgets/build.gradle.kts @@ -22,8 +22,10 @@ kotlin { val commonMain by getting { dependencies { implementation(compose.runtime) - implementation(project(":web-core")) implementation(kotlin("stdlib-common")) + + implementation(project(":web-core")) + implementation(project(":web-widgets")) } } diff --git a/web/settings.gradle.kts b/web/settings.gradle.kts index 395a114be4..ce5d2416e7 100644 --- a/web/settings.gradle.kts +++ b/web/settings.gradle.kts @@ -20,9 +20,11 @@ pluginManagement { } include("web-core") +include("web-widgets") include("web-integration-core") include("web-integration-widgets") project(":web-core").projectDir = file("$rootDir/core") +project(":web-widgets").projectDir = file("$rootDir/widgets") project(":web-integration-core").projectDir = file("$rootDir/integration-core") project(":web-integration-widgets").projectDir = file("$rootDir/integration-widgets") diff --git a/web/core/src/commonMain/kotlin/withWeb/Alignment.kt b/web/widgets/src/commonMain/kotlin/Alignment.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/Alignment.kt rename to web/widgets/src/commonMain/kotlin/Alignment.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/Arrangement.kt b/web/widgets/src/commonMain/kotlin/Arrangement.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/Arrangement.kt rename to web/widgets/src/commonMain/kotlin/Arrangement.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/Color.kt b/web/widgets/src/commonMain/kotlin/Color.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/Color.kt rename to web/widgets/src/commonMain/kotlin/Color.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/Modifier.kt b/web/widgets/src/commonMain/kotlin/Modifier.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/Modifier.kt rename to web/widgets/src/commonMain/kotlin/Modifier.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/box.kt b/web/widgets/src/commonMain/kotlin/layouts/box.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/box.kt rename to web/widgets/src/commonMain/kotlin/layouts/box.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/button.kt b/web/widgets/src/commonMain/kotlin/layouts/button.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/button.kt rename to web/widgets/src/commonMain/kotlin/layouts/button.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/column.kt b/web/widgets/src/commonMain/kotlin/layouts/column.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/column.kt rename to web/widgets/src/commonMain/kotlin/layouts/column.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/defaults/BoxDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/BoxDefault.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/defaults/BoxDefault.kt rename to web/widgets/src/commonMain/kotlin/layouts/defaults/BoxDefault.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/defaults/ButtonDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/ButtonDefault.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/defaults/ButtonDefault.kt rename to web/widgets/src/commonMain/kotlin/layouts/defaults/ButtonDefault.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/defaults/ColumnDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/ColumnDefault.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/defaults/ColumnDefault.kt rename to web/widgets/src/commonMain/kotlin/layouts/defaults/ColumnDefault.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/defaults/ModifierDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/ModifierDefault.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/defaults/ModifierDefault.kt rename to web/widgets/src/commonMain/kotlin/layouts/defaults/ModifierDefault.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/defaults/RowDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/RowDefault.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/defaults/RowDefault.kt rename to web/widgets/src/commonMain/kotlin/layouts/defaults/RowDefault.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/defaults/SliderDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/SliderDefault.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/defaults/SliderDefault.kt rename to web/widgets/src/commonMain/kotlin/layouts/defaults/SliderDefault.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/defaults/TextDefault.kt b/web/widgets/src/commonMain/kotlin/layouts/defaults/TextDefault.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/defaults/TextDefault.kt rename to web/widgets/src/commonMain/kotlin/layouts/defaults/TextDefault.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/row.kt b/web/widgets/src/commonMain/kotlin/layouts/row.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/row.kt rename to web/widgets/src/commonMain/kotlin/layouts/row.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/shapes/shapes.kt b/web/widgets/src/commonMain/kotlin/layouts/shapes/shapes.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/shapes/shapes.kt rename to web/widgets/src/commonMain/kotlin/layouts/shapes/shapes.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/slider.kt b/web/widgets/src/commonMain/kotlin/layouts/slider.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/slider.kt rename to web/widgets/src/commonMain/kotlin/layouts/slider.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/layouts/text.kt b/web/widgets/src/commonMain/kotlin/layouts/text.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/layouts/text.kt rename to web/widgets/src/commonMain/kotlin/layouts/text.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/modifiers/border.kt b/web/widgets/src/commonMain/kotlin/modifiers/border.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/modifiers/border.kt rename to web/widgets/src/commonMain/kotlin/modifiers/border.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/modifiers/clickable.kt b/web/widgets/src/commonMain/kotlin/modifiers/clickable.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/modifiers/clickable.kt rename to web/widgets/src/commonMain/kotlin/modifiers/clickable.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/modifiers/clip.kt b/web/widgets/src/commonMain/kotlin/modifiers/clip.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/modifiers/clip.kt rename to web/widgets/src/commonMain/kotlin/modifiers/clip.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/modifiers/fillMaxHeight.kt b/web/widgets/src/commonMain/kotlin/modifiers/fillMaxHeight.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/modifiers/fillMaxHeight.kt rename to web/widgets/src/commonMain/kotlin/modifiers/fillMaxHeight.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/modifiers/fillMaxWidth.kt b/web/widgets/src/commonMain/kotlin/modifiers/fillMaxWidth.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/modifiers/fillMaxWidth.kt rename to web/widgets/src/commonMain/kotlin/modifiers/fillMaxWidth.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/modifiers/offset.kt b/web/widgets/src/commonMain/kotlin/modifiers/offset.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/modifiers/offset.kt rename to web/widgets/src/commonMain/kotlin/modifiers/offset.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/modifiers/onSizeChanged.kt b/web/widgets/src/commonMain/kotlin/modifiers/onSizeChanged.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/modifiers/onSizeChanged.kt rename to web/widgets/src/commonMain/kotlin/modifiers/onSizeChanged.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/modifiers/size.kt b/web/widgets/src/commonMain/kotlin/modifiers/size.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/modifiers/size.kt rename to web/widgets/src/commonMain/kotlin/modifiers/size.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/modifiers/width.kt b/web/widgets/src/commonMain/kotlin/modifiers/width.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/modifiers/width.kt rename to web/widgets/src/commonMain/kotlin/modifiers/width.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/units/Dp.kt b/web/widgets/src/commonMain/kotlin/units/Dp.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/units/Dp.kt rename to web/widgets/src/commonMain/kotlin/units/Dp.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/units/IntSize.kt b/web/widgets/src/commonMain/kotlin/units/IntSize.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/units/IntSize.kt rename to web/widgets/src/commonMain/kotlin/units/IntSize.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/units/TextUnit.kt b/web/widgets/src/commonMain/kotlin/units/TextUnit.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/units/TextUnit.kt rename to web/widgets/src/commonMain/kotlin/units/TextUnit.kt diff --git a/web/core/src/commonMain/kotlin/withWeb/units/unitConversion.kt b/web/widgets/src/commonMain/kotlin/units/unitConversion.kt similarity index 100% rename from web/core/src/commonMain/kotlin/withWeb/units/unitConversion.kt rename to web/widgets/src/commonMain/kotlin/units/unitConversion.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/Modifier.kt b/web/widgets/src/jsMain/kotlin/Modifier.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/Modifier.kt rename to web/widgets/src/jsMain/kotlin/Modifier.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/Styles.kt b/web/widgets/src/jsMain/kotlin/Styles.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/Styles.kt rename to web/widgets/src/jsMain/kotlin/Styles.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/internal/ActualModifier.kt b/web/widgets/src/jsMain/kotlin/internal/ActualModifier.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/internal/ActualModifier.kt rename to web/widgets/src/jsMain/kotlin/internal/ActualModifier.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/layouts/box.kt b/web/widgets/src/jsMain/kotlin/layouts/box.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/layouts/box.kt rename to web/widgets/src/jsMain/kotlin/layouts/box.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/layouts/button.kt b/web/widgets/src/jsMain/kotlin/layouts/button.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/layouts/button.kt rename to web/widgets/src/jsMain/kotlin/layouts/button.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/layouts/column.kt b/web/widgets/src/jsMain/kotlin/layouts/column.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/layouts/column.kt rename to web/widgets/src/jsMain/kotlin/layouts/column.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/layouts/row.kt b/web/widgets/src/jsMain/kotlin/layouts/row.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/layouts/row.kt rename to web/widgets/src/jsMain/kotlin/layouts/row.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/layouts/slider.kt b/web/widgets/src/jsMain/kotlin/layouts/slider.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/layouts/slider.kt rename to web/widgets/src/jsMain/kotlin/layouts/slider.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/layouts/text.kt b/web/widgets/src/jsMain/kotlin/layouts/text.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/layouts/text.kt rename to web/widgets/src/jsMain/kotlin/layouts/text.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/modifiers/border.kt b/web/widgets/src/jsMain/kotlin/modifiers/border.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/modifiers/border.kt rename to web/widgets/src/jsMain/kotlin/modifiers/border.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/modifiers/clickable.kt b/web/widgets/src/jsMain/kotlin/modifiers/clickable.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/modifiers/clickable.kt rename to web/widgets/src/jsMain/kotlin/modifiers/clickable.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/modifiers/clip.kt b/web/widgets/src/jsMain/kotlin/modifiers/clip.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/modifiers/clip.kt rename to web/widgets/src/jsMain/kotlin/modifiers/clip.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/modifiers/fillMaxHeight.kt b/web/widgets/src/jsMain/kotlin/modifiers/fillMaxHeight.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/modifiers/fillMaxHeight.kt rename to web/widgets/src/jsMain/kotlin/modifiers/fillMaxHeight.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/modifiers/fillMaxWidth.kt b/web/widgets/src/jsMain/kotlin/modifiers/fillMaxWidth.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/modifiers/fillMaxWidth.kt rename to web/widgets/src/jsMain/kotlin/modifiers/fillMaxWidth.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/modifiers/offset.kt b/web/widgets/src/jsMain/kotlin/modifiers/offset.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/modifiers/offset.kt rename to web/widgets/src/jsMain/kotlin/modifiers/offset.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/modifiers/onSizeChanged.kt b/web/widgets/src/jsMain/kotlin/modifiers/onSizeChanged.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/modifiers/onSizeChanged.kt rename to web/widgets/src/jsMain/kotlin/modifiers/onSizeChanged.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/modifiers/size.kt b/web/widgets/src/jsMain/kotlin/modifiers/size.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/modifiers/size.kt rename to web/widgets/src/jsMain/kotlin/modifiers/size.kt diff --git a/web/core/src/jsMain/kotlin/withWeb/modifiers/width.kt b/web/widgets/src/jsMain/kotlin/modifiers/width.kt similarity index 100% rename from web/core/src/jsMain/kotlin/withWeb/modifiers/width.kt rename to web/widgets/src/jsMain/kotlin/modifiers/width.kt diff --git a/web/core/src/jsTest/kotlin/commonApi/ModifierTests.kt b/web/widgets/src/jsTest/ModifierTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/commonApi/ModifierTests.kt rename to web/widgets/src/jsTest/ModifierTests.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/Alignment.kt b/web/widgets/src/jvmMain/kotlin/Alignment.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/Alignment.kt rename to web/widgets/src/jvmMain/kotlin/Alignment.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/Arrangement.kt b/web/widgets/src/jvmMain/kotlin/Arrangement.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/Arrangement.kt rename to web/widgets/src/jvmMain/kotlin/Arrangement.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/Color.kt b/web/widgets/src/jvmMain/kotlin/Color.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/Color.kt rename to web/widgets/src/jvmMain/kotlin/Color.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/Modifier.kt b/web/widgets/src/jvmMain/kotlin/Modifier.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/Modifier.kt rename to web/widgets/src/jvmMain/kotlin/Modifier.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/internal/ActualModifier.kt b/web/widgets/src/jvmMain/kotlin/internal/ActualModifier.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/internal/ActualModifier.kt rename to web/widgets/src/jvmMain/kotlin/internal/ActualModifier.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/layouts/box.kt b/web/widgets/src/jvmMain/kotlin/layouts/box.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/layouts/box.kt rename to web/widgets/src/jvmMain/kotlin/layouts/box.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/layouts/button.kt b/web/widgets/src/jvmMain/kotlin/layouts/button.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/layouts/button.kt rename to web/widgets/src/jvmMain/kotlin/layouts/button.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/layouts/column.kt b/web/widgets/src/jvmMain/kotlin/layouts/column.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/layouts/column.kt rename to web/widgets/src/jvmMain/kotlin/layouts/column.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/layouts/row.kt b/web/widgets/src/jvmMain/kotlin/layouts/row.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/layouts/row.kt rename to web/widgets/src/jvmMain/kotlin/layouts/row.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/layouts/shapes/shapes.kt b/web/widgets/src/jvmMain/kotlin/layouts/shapes/shapes.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/layouts/shapes/shapes.kt rename to web/widgets/src/jvmMain/kotlin/layouts/shapes/shapes.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/layouts/slider.kt b/web/widgets/src/jvmMain/kotlin/layouts/slider.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/layouts/slider.kt rename to web/widgets/src/jvmMain/kotlin/layouts/slider.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/layouts/text.kt b/web/widgets/src/jvmMain/kotlin/layouts/text.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/layouts/text.kt rename to web/widgets/src/jvmMain/kotlin/layouts/text.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/modifiers/border.kt b/web/widgets/src/jvmMain/kotlin/modifiers/border.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/modifiers/border.kt rename to web/widgets/src/jvmMain/kotlin/modifiers/border.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/modifiers/clickable.kt b/web/widgets/src/jvmMain/kotlin/modifiers/clickable.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/modifiers/clickable.kt rename to web/widgets/src/jvmMain/kotlin/modifiers/clickable.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/modifiers/clip.kt b/web/widgets/src/jvmMain/kotlin/modifiers/clip.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/modifiers/clip.kt rename to web/widgets/src/jvmMain/kotlin/modifiers/clip.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/modifiers/fillMaxHeight.kt b/web/widgets/src/jvmMain/kotlin/modifiers/fillMaxHeight.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/modifiers/fillMaxHeight.kt rename to web/widgets/src/jvmMain/kotlin/modifiers/fillMaxHeight.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/modifiers/fillMaxWidth.kt b/web/widgets/src/jvmMain/kotlin/modifiers/fillMaxWidth.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/modifiers/fillMaxWidth.kt rename to web/widgets/src/jvmMain/kotlin/modifiers/fillMaxWidth.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/modifiers/offset.kt b/web/widgets/src/jvmMain/kotlin/modifiers/offset.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/modifiers/offset.kt rename to web/widgets/src/jvmMain/kotlin/modifiers/offset.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/modifiers/onSizeChanged.kt b/web/widgets/src/jvmMain/kotlin/modifiers/onSizeChanged.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/modifiers/onSizeChanged.kt rename to web/widgets/src/jvmMain/kotlin/modifiers/onSizeChanged.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/modifiers/size.kt b/web/widgets/src/jvmMain/kotlin/modifiers/size.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/modifiers/size.kt rename to web/widgets/src/jvmMain/kotlin/modifiers/size.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/modifiers/width.kt b/web/widgets/src/jvmMain/kotlin/modifiers/width.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/modifiers/width.kt rename to web/widgets/src/jvmMain/kotlin/modifiers/width.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/units/Dp.kt b/web/widgets/src/jvmMain/kotlin/units/Dp.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/units/Dp.kt rename to web/widgets/src/jvmMain/kotlin/units/Dp.kt diff --git a/web/core/src/jvmMain/kotlin/withWeb/units/TextUnit.kt b/web/widgets/src/jvmMain/kotlin/units/TextUnit.kt similarity index 100% rename from web/core/src/jvmMain/kotlin/withWeb/units/TextUnit.kt rename to web/widgets/src/jvmMain/kotlin/units/TextUnit.kt