Browse Source

Split web-core to web-core and web-integration

This also means that we have new naming for web artifacts in the gradle plugin
pull/690/head
Shagen Ogandzhanian 4 years ago
parent
commit
06a905e63a
  1. 6
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt
  2. 4
      web/gradle.properties
  3. 4
      web/integration-widgets/build.gradle.kts
  4. 2
      web/settings.gradle.kts
  5. 0
      web/widgets/src/commonMain/kotlin/Alignment.kt
  6. 0
      web/widgets/src/commonMain/kotlin/Arrangement.kt
  7. 0
      web/widgets/src/commonMain/kotlin/Color.kt
  8. 0
      web/widgets/src/commonMain/kotlin/Modifier.kt
  9. 0
      web/widgets/src/commonMain/kotlin/layouts/box.kt
  10. 0
      web/widgets/src/commonMain/kotlin/layouts/button.kt
  11. 0
      web/widgets/src/commonMain/kotlin/layouts/column.kt
  12. 0
      web/widgets/src/commonMain/kotlin/layouts/defaults/BoxDefault.kt
  13. 0
      web/widgets/src/commonMain/kotlin/layouts/defaults/ButtonDefault.kt
  14. 0
      web/widgets/src/commonMain/kotlin/layouts/defaults/ColumnDefault.kt
  15. 0
      web/widgets/src/commonMain/kotlin/layouts/defaults/ModifierDefault.kt
  16. 0
      web/widgets/src/commonMain/kotlin/layouts/defaults/RowDefault.kt
  17. 0
      web/widgets/src/commonMain/kotlin/layouts/defaults/SliderDefault.kt
  18. 0
      web/widgets/src/commonMain/kotlin/layouts/defaults/TextDefault.kt
  19. 0
      web/widgets/src/commonMain/kotlin/layouts/row.kt
  20. 0
      web/widgets/src/commonMain/kotlin/layouts/shapes/shapes.kt
  21. 0
      web/widgets/src/commonMain/kotlin/layouts/slider.kt
  22. 0
      web/widgets/src/commonMain/kotlin/layouts/text.kt
  23. 0
      web/widgets/src/commonMain/kotlin/modifiers/border.kt
  24. 0
      web/widgets/src/commonMain/kotlin/modifiers/clickable.kt
  25. 0
      web/widgets/src/commonMain/kotlin/modifiers/clip.kt
  26. 0
      web/widgets/src/commonMain/kotlin/modifiers/fillMaxHeight.kt
  27. 0
      web/widgets/src/commonMain/kotlin/modifiers/fillMaxWidth.kt
  28. 0
      web/widgets/src/commonMain/kotlin/modifiers/offset.kt
  29. 0
      web/widgets/src/commonMain/kotlin/modifiers/onSizeChanged.kt
  30. 0
      web/widgets/src/commonMain/kotlin/modifiers/size.kt
  31. 0
      web/widgets/src/commonMain/kotlin/modifiers/width.kt
  32. 0
      web/widgets/src/commonMain/kotlin/units/Dp.kt
  33. 0
      web/widgets/src/commonMain/kotlin/units/IntSize.kt
  34. 0
      web/widgets/src/commonMain/kotlin/units/TextUnit.kt
  35. 0
      web/widgets/src/commonMain/kotlin/units/unitConversion.kt
  36. 0
      web/widgets/src/jsMain/kotlin/Modifier.kt
  37. 0
      web/widgets/src/jsMain/kotlin/Styles.kt
  38. 0
      web/widgets/src/jsMain/kotlin/internal/ActualModifier.kt
  39. 0
      web/widgets/src/jsMain/kotlin/layouts/box.kt
  40. 0
      web/widgets/src/jsMain/kotlin/layouts/button.kt
  41. 0
      web/widgets/src/jsMain/kotlin/layouts/column.kt
  42. 0
      web/widgets/src/jsMain/kotlin/layouts/row.kt
  43. 0
      web/widgets/src/jsMain/kotlin/layouts/slider.kt
  44. 0
      web/widgets/src/jsMain/kotlin/layouts/text.kt
  45. 0
      web/widgets/src/jsMain/kotlin/modifiers/border.kt
  46. 0
      web/widgets/src/jsMain/kotlin/modifiers/clickable.kt
  47. 0
      web/widgets/src/jsMain/kotlin/modifiers/clip.kt
  48. 0
      web/widgets/src/jsMain/kotlin/modifiers/fillMaxHeight.kt
  49. 0
      web/widgets/src/jsMain/kotlin/modifiers/fillMaxWidth.kt
  50. 0
      web/widgets/src/jsMain/kotlin/modifiers/offset.kt
  51. 0
      web/widgets/src/jsMain/kotlin/modifiers/onSizeChanged.kt
  52. 0
      web/widgets/src/jsMain/kotlin/modifiers/size.kt
  53. 0
      web/widgets/src/jsMain/kotlin/modifiers/width.kt
  54. 0
      web/widgets/src/jsTest/ModifierTests.kt
  55. 0
      web/widgets/src/jvmMain/kotlin/Alignment.kt
  56. 0
      web/widgets/src/jvmMain/kotlin/Arrangement.kt
  57. 0
      web/widgets/src/jvmMain/kotlin/Color.kt
  58. 0
      web/widgets/src/jvmMain/kotlin/Modifier.kt
  59. 0
      web/widgets/src/jvmMain/kotlin/internal/ActualModifier.kt
  60. 0
      web/widgets/src/jvmMain/kotlin/layouts/box.kt
  61. 0
      web/widgets/src/jvmMain/kotlin/layouts/button.kt
  62. 0
      web/widgets/src/jvmMain/kotlin/layouts/column.kt
  63. 0
      web/widgets/src/jvmMain/kotlin/layouts/row.kt
  64. 0
      web/widgets/src/jvmMain/kotlin/layouts/shapes/shapes.kt
  65. 0
      web/widgets/src/jvmMain/kotlin/layouts/slider.kt
  66. 0
      web/widgets/src/jvmMain/kotlin/layouts/text.kt
  67. 0
      web/widgets/src/jvmMain/kotlin/modifiers/border.kt
  68. 0
      web/widgets/src/jvmMain/kotlin/modifiers/clickable.kt
  69. 0
      web/widgets/src/jvmMain/kotlin/modifiers/clip.kt
  70. 0
      web/widgets/src/jvmMain/kotlin/modifiers/fillMaxHeight.kt
  71. 0
      web/widgets/src/jvmMain/kotlin/modifiers/fillMaxWidth.kt
  72. 0
      web/widgets/src/jvmMain/kotlin/modifiers/offset.kt
  73. 0
      web/widgets/src/jvmMain/kotlin/modifiers/onSizeChanged.kt
  74. 0
      web/widgets/src/jvmMain/kotlin/modifiers/size.kt
  75. 0
      web/widgets/src/jvmMain/kotlin/modifiers/width.kt
  76. 0
      web/widgets/src/jvmMain/kotlin/units/Dp.kt
  77. 0
      web/widgets/src/jvmMain/kotlin/units/TextUnit.kt

6
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt

@ -150,9 +150,13 @@ class ComposePlugin : Plugin<Project> {
}
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")
}
}
}

4
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

4
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"))
}
}

2
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")

0
web/core/src/commonMain/kotlin/withWeb/Alignment.kt → web/widgets/src/commonMain/kotlin/Alignment.kt

0
web/core/src/commonMain/kotlin/withWeb/Arrangement.kt → web/widgets/src/commonMain/kotlin/Arrangement.kt

0
web/core/src/commonMain/kotlin/withWeb/Color.kt → web/widgets/src/commonMain/kotlin/Color.kt

0
web/core/src/commonMain/kotlin/withWeb/Modifier.kt → web/widgets/src/commonMain/kotlin/Modifier.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/box.kt → web/widgets/src/commonMain/kotlin/layouts/box.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/button.kt → web/widgets/src/commonMain/kotlin/layouts/button.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/column.kt → web/widgets/src/commonMain/kotlin/layouts/column.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/defaults/BoxDefault.kt → web/widgets/src/commonMain/kotlin/layouts/defaults/BoxDefault.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/defaults/ButtonDefault.kt → web/widgets/src/commonMain/kotlin/layouts/defaults/ButtonDefault.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/defaults/ColumnDefault.kt → web/widgets/src/commonMain/kotlin/layouts/defaults/ColumnDefault.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/defaults/ModifierDefault.kt → web/widgets/src/commonMain/kotlin/layouts/defaults/ModifierDefault.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/defaults/RowDefault.kt → web/widgets/src/commonMain/kotlin/layouts/defaults/RowDefault.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/defaults/SliderDefault.kt → web/widgets/src/commonMain/kotlin/layouts/defaults/SliderDefault.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/defaults/TextDefault.kt → web/widgets/src/commonMain/kotlin/layouts/defaults/TextDefault.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/row.kt → web/widgets/src/commonMain/kotlin/layouts/row.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/shapes/shapes.kt → web/widgets/src/commonMain/kotlin/layouts/shapes/shapes.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/slider.kt → web/widgets/src/commonMain/kotlin/layouts/slider.kt

0
web/core/src/commonMain/kotlin/withWeb/layouts/text.kt → web/widgets/src/commonMain/kotlin/layouts/text.kt

0
web/core/src/commonMain/kotlin/withWeb/modifiers/border.kt → web/widgets/src/commonMain/kotlin/modifiers/border.kt

0
web/core/src/commonMain/kotlin/withWeb/modifiers/clickable.kt → web/widgets/src/commonMain/kotlin/modifiers/clickable.kt

0
web/core/src/commonMain/kotlin/withWeb/modifiers/clip.kt → web/widgets/src/commonMain/kotlin/modifiers/clip.kt

0
web/core/src/commonMain/kotlin/withWeb/modifiers/fillMaxHeight.kt → web/widgets/src/commonMain/kotlin/modifiers/fillMaxHeight.kt

0
web/core/src/commonMain/kotlin/withWeb/modifiers/fillMaxWidth.kt → web/widgets/src/commonMain/kotlin/modifiers/fillMaxWidth.kt

0
web/core/src/commonMain/kotlin/withWeb/modifiers/offset.kt → web/widgets/src/commonMain/kotlin/modifiers/offset.kt

0
web/core/src/commonMain/kotlin/withWeb/modifiers/onSizeChanged.kt → web/widgets/src/commonMain/kotlin/modifiers/onSizeChanged.kt

0
web/core/src/commonMain/kotlin/withWeb/modifiers/size.kt → web/widgets/src/commonMain/kotlin/modifiers/size.kt

0
web/core/src/commonMain/kotlin/withWeb/modifiers/width.kt → web/widgets/src/commonMain/kotlin/modifiers/width.kt

0
web/core/src/commonMain/kotlin/withWeb/units/Dp.kt → web/widgets/src/commonMain/kotlin/units/Dp.kt

0
web/core/src/commonMain/kotlin/withWeb/units/IntSize.kt → web/widgets/src/commonMain/kotlin/units/IntSize.kt

0
web/core/src/commonMain/kotlin/withWeb/units/TextUnit.kt → web/widgets/src/commonMain/kotlin/units/TextUnit.kt

0
web/core/src/commonMain/kotlin/withWeb/units/unitConversion.kt → web/widgets/src/commonMain/kotlin/units/unitConversion.kt

0
web/core/src/jsMain/kotlin/withWeb/Modifier.kt → web/widgets/src/jsMain/kotlin/Modifier.kt

0
web/core/src/jsMain/kotlin/withWeb/Styles.kt → web/widgets/src/jsMain/kotlin/Styles.kt

0
web/core/src/jsMain/kotlin/withWeb/internal/ActualModifier.kt → web/widgets/src/jsMain/kotlin/internal/ActualModifier.kt

0
web/core/src/jsMain/kotlin/withWeb/layouts/box.kt → web/widgets/src/jsMain/kotlin/layouts/box.kt

0
web/core/src/jsMain/kotlin/withWeb/layouts/button.kt → web/widgets/src/jsMain/kotlin/layouts/button.kt

0
web/core/src/jsMain/kotlin/withWeb/layouts/column.kt → web/widgets/src/jsMain/kotlin/layouts/column.kt

0
web/core/src/jsMain/kotlin/withWeb/layouts/row.kt → web/widgets/src/jsMain/kotlin/layouts/row.kt

0
web/core/src/jsMain/kotlin/withWeb/layouts/slider.kt → web/widgets/src/jsMain/kotlin/layouts/slider.kt

0
web/core/src/jsMain/kotlin/withWeb/layouts/text.kt → web/widgets/src/jsMain/kotlin/layouts/text.kt

0
web/core/src/jsMain/kotlin/withWeb/modifiers/border.kt → web/widgets/src/jsMain/kotlin/modifiers/border.kt

0
web/core/src/jsMain/kotlin/withWeb/modifiers/clickable.kt → web/widgets/src/jsMain/kotlin/modifiers/clickable.kt

0
web/core/src/jsMain/kotlin/withWeb/modifiers/clip.kt → web/widgets/src/jsMain/kotlin/modifiers/clip.kt

0
web/core/src/jsMain/kotlin/withWeb/modifiers/fillMaxHeight.kt → web/widgets/src/jsMain/kotlin/modifiers/fillMaxHeight.kt

0
web/core/src/jsMain/kotlin/withWeb/modifiers/fillMaxWidth.kt → web/widgets/src/jsMain/kotlin/modifiers/fillMaxWidth.kt

0
web/core/src/jsMain/kotlin/withWeb/modifiers/offset.kt → web/widgets/src/jsMain/kotlin/modifiers/offset.kt

0
web/core/src/jsMain/kotlin/withWeb/modifiers/onSizeChanged.kt → web/widgets/src/jsMain/kotlin/modifiers/onSizeChanged.kt

0
web/core/src/jsMain/kotlin/withWeb/modifiers/size.kt → web/widgets/src/jsMain/kotlin/modifiers/size.kt

0
web/core/src/jsMain/kotlin/withWeb/modifiers/width.kt → web/widgets/src/jsMain/kotlin/modifiers/width.kt

0
web/core/src/jsTest/kotlin/commonApi/ModifierTests.kt → web/widgets/src/jsTest/ModifierTests.kt

0
web/core/src/jvmMain/kotlin/withWeb/Alignment.kt → web/widgets/src/jvmMain/kotlin/Alignment.kt

0
web/core/src/jvmMain/kotlin/withWeb/Arrangement.kt → web/widgets/src/jvmMain/kotlin/Arrangement.kt

0
web/core/src/jvmMain/kotlin/withWeb/Color.kt → web/widgets/src/jvmMain/kotlin/Color.kt

0
web/core/src/jvmMain/kotlin/withWeb/Modifier.kt → web/widgets/src/jvmMain/kotlin/Modifier.kt

0
web/core/src/jvmMain/kotlin/withWeb/internal/ActualModifier.kt → web/widgets/src/jvmMain/kotlin/internal/ActualModifier.kt

0
web/core/src/jvmMain/kotlin/withWeb/layouts/box.kt → web/widgets/src/jvmMain/kotlin/layouts/box.kt

0
web/core/src/jvmMain/kotlin/withWeb/layouts/button.kt → web/widgets/src/jvmMain/kotlin/layouts/button.kt

0
web/core/src/jvmMain/kotlin/withWeb/layouts/column.kt → web/widgets/src/jvmMain/kotlin/layouts/column.kt

0
web/core/src/jvmMain/kotlin/withWeb/layouts/row.kt → web/widgets/src/jvmMain/kotlin/layouts/row.kt

0
web/core/src/jvmMain/kotlin/withWeb/layouts/shapes/shapes.kt → web/widgets/src/jvmMain/kotlin/layouts/shapes/shapes.kt

0
web/core/src/jvmMain/kotlin/withWeb/layouts/slider.kt → web/widgets/src/jvmMain/kotlin/layouts/slider.kt

0
web/core/src/jvmMain/kotlin/withWeb/layouts/text.kt → web/widgets/src/jvmMain/kotlin/layouts/text.kt

0
web/core/src/jvmMain/kotlin/withWeb/modifiers/border.kt → web/widgets/src/jvmMain/kotlin/modifiers/border.kt

0
web/core/src/jvmMain/kotlin/withWeb/modifiers/clickable.kt → web/widgets/src/jvmMain/kotlin/modifiers/clickable.kt

0
web/core/src/jvmMain/kotlin/withWeb/modifiers/clip.kt → web/widgets/src/jvmMain/kotlin/modifiers/clip.kt

0
web/core/src/jvmMain/kotlin/withWeb/modifiers/fillMaxHeight.kt → web/widgets/src/jvmMain/kotlin/modifiers/fillMaxHeight.kt

0
web/core/src/jvmMain/kotlin/withWeb/modifiers/fillMaxWidth.kt → web/widgets/src/jvmMain/kotlin/modifiers/fillMaxWidth.kt

0
web/core/src/jvmMain/kotlin/withWeb/modifiers/offset.kt → web/widgets/src/jvmMain/kotlin/modifiers/offset.kt

0
web/core/src/jvmMain/kotlin/withWeb/modifiers/onSizeChanged.kt → web/widgets/src/jvmMain/kotlin/modifiers/onSizeChanged.kt

0
web/core/src/jvmMain/kotlin/withWeb/modifiers/size.kt → web/widgets/src/jvmMain/kotlin/modifiers/size.kt

0
web/core/src/jvmMain/kotlin/withWeb/modifiers/width.kt → web/widgets/src/jvmMain/kotlin/modifiers/width.kt

0
web/core/src/jvmMain/kotlin/withWeb/units/Dp.kt → web/widgets/src/jvmMain/kotlin/units/Dp.kt

0
web/core/src/jvmMain/kotlin/withWeb/units/TextUnit.kt → web/widgets/src/jvmMain/kotlin/units/TextUnit.kt

Loading…
Cancel
Save