From 760f3f5b2438119d02cf1f5549ea5d974b4984d8 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Thu, 30 Nov 2023 11:18:06 +0100 Subject: [PATCH] Revert "Rename components library modules. (#3991)" --- .../build.gradle.kts | 2 +- .../compose/animatedimage/demo/Main.kt | 0 .../src/jvmMain/resources/demo.webp | Bin .../build.gradle.kts | 0 .../compose/animatedimage/AnimatedImage.kt | 0 .../animatedimage/AnimatedImageLoader.kt | 0 .../animatedimage/DesktopAnimatedImage.kt | 0 .../animatedimage/LocalAnimatedImageLoader.kt | 0 .../NetworkAnimatedImageLoader.kt | 0 .../ResourceAnimatedImageLoader.kt | 0 .../build.gradle.kts | 2 +- .../jetbrains/compose/splitpane/demo/Main.kt | 0 .../build.gradle.kts | 0 .../splitpane/ExperimentalSplitPaneApi.kt | 0 .../jetbrains/compose/splitpane/SplitPane.kt | 0 .../compose/splitpane/SplitPaneDSL.kt | 0 .../compose/splitpane/SplitPaneState.kt | 0 .../jetbrains/compose/splitpane/Splitter.kt | 0 .../compose/splitpane/DesktopSplitPane.kt | 0 .../compose/splitpane/DesktopSplitter.kt | 0 .../.gitignore | 0 .../androidApp/build.gradle.kts | 2 +- .../androidApp/src/main/AndroidManifest.xml | 0 .../compose/resources/demo/MainActivity.kt | 0 .../src/main/res/values/strings.xml | 0 .../desktopApp/build.gradle.kts | 2 +- .../desktopApp/src/jvmMain/kotlin/Main.kt | 0 .../iosApp/Configuration/TeamId.xcconfig | 0 .../iosApp/iosApp.xcodeproj/project.pbxproj | 0 .../iosApp/iosApp/Info.plist | 0 .../iosApp/iosApp/iosApp.swift | 0 .../shared/build.gradle.kts | 2 +- .../src/androidMain/assets/font_awesome.otf | Bin .../resources/demo/shared/main.android.kt | 0 .../compose/resources/demo/shared/FileRes.kt | 0 .../compose/resources/demo/shared/FontRes.kt | 0 .../resources/demo/shared/ImagesRes.kt | 0 .../resources/demo/shared/StringRes.kt | 0 .../resources/demo/shared/UseResources.kt | 0 .../src/commonMain/resources/font_awesome.otf | Bin .../commonMain/resources/images/compose.png | Bin .../resources/images/droid_icon.xml | 0 .../resources/images/insta_icon.xml | 0 .../src/commonMain/resources/images/land.webp | Bin .../src/commonMain/resources/strings.xml | 0 .../resources/demo/shared/main.desktop.kt | 0 .../shared/src/iosMain/kotlin/main.ios.kt | 0 .../shared/src/jsMain/kotlin/main.js.kt | 0 .../shared/src/jsMain/resources/index.html | 0 .../shared/src/macosMain/kotlin/main.macos.kt | 0 .../build.gradle.kts | 0 .../assets/font_awesome.otf | Bin .../resources/ComposeResourceTest.android.kt | 0 .../resources/FontResources.android.kt | 0 .../resources/ImageResources.android.kt | 0 .../resources/PlatformState.blocking.kt | 0 .../compose/resources/Resource.blocking.kt | 0 .../compose/resources/TestUtils.blocking.kt | 0 .../compose/resources/FontResources.kt | 0 .../compose/resources/ImageResources.kt | 0 .../compose/resources/PlatformState.kt | 0 .../jetbrains/compose/resources/Resource.kt | 0 .../compose/resources/ResourceIndex.kt | 0 .../compose/resources/ResourceReader.kt | 0 .../compose/resources/StringResources.kt | 0 .../compose/resources/vector/ValueParsers.kt | 0 .../resources/vector/XmlVectorParser.kt | 0 .../resources/vector/xmldom/Element.kt | 0 .../vector/xmldom/MalformedXMLException.kt | 0 .../compose/resources/vector/xmldom/Node.kt | 0 .../resources/vector/xmldom/NodeList.kt | 0 .../resources/RecompositionsCounter.kt | 0 .../compose/resources/ResourceTest.kt | 0 .../compose/resources/TestResourceReader.kt | 0 .../jetbrains/compose/resources/TestUtils.kt | 0 .../src/commonTest/resources/1.png | Bin .../src/commonTest/resources/2.png | Bin .../src/commonTest/resources/font_awesome.otf | Bin .../src/commonTest/resources/strings.xml | 0 .../resources/ComposeResourceTest.desktop.kt | 0 .../compose/resources/ResourceReader.ios.kt | 0 .../compose/resources/ImageResources.js.kt | 0 .../compose/resources/PlatformState.js.kt | 0 .../compose/resources/Resource.js.kt | 0 .../compose/resources/ResourceReader.js.kt | 0 .../resources/vector/xmldom/ElementImpl.kt | 0 .../resources/vector/xmldom/NodeImpl.kt | 0 .../compose/resources/TestUtils.js.kt | 0 .../resources/ImageResources.jvmAndAndroid.kt | 0 .../resources/ResourceReader.jvmAndAndroid.kt | 0 .../resources/vector/xmldom/ElementImpl.kt | 0 .../resources/vector/xmldom/NodeImpl.kt | 0 .../compose/resources/ResourceReader.macos.kt | 0 .../resources/ImageResources.native.kt | 0 .../resources/vector/xmldom/DomXmlParser.kt | 0 .../compose/resources/FontResources.skiko.kt | 0 .../compose/resources/ImageResources.skiko.kt | 0 components/settings.gradle.kts | 22 +++++++++--------- .../desktopApp/build.gradle.kts | 2 +- .../desktopApp/src/jvmMain/kotlin/Main.kt | 0 .../shared/build.gradle.kts | 2 +- .../demo/shared/UsePreviewAnnotation.kt | 0 .../preview/demo/shared/main.desktop.kt | 0 .../build.gradle.kts | 0 .../compose/ui/tooling/preview/Preview.kt | 0 .../ui/tooling/preview/PreviewParameter.kt | 0 106 files changed, 18 insertions(+), 18 deletions(-) rename components/AnimatedImage/{components-animatedimage-demo => demo}/build.gradle.kts (85%) rename components/AnimatedImage/{components-animatedimage-demo => demo}/src/jvmMain/kotlin/org/jetbrains/compose/animatedimage/demo/Main.kt (100%) rename components/AnimatedImage/{components-animatedimage-demo => demo}/src/jvmMain/resources/demo.webp (100%) rename components/AnimatedImage/{components-animatedimage => library}/build.gradle.kts (100%) rename components/AnimatedImage/{components-animatedimage => library}/src/commonMain/kotlin/org/jetbrains/compose/animatedimage/AnimatedImage.kt (100%) rename components/AnimatedImage/{components-animatedimage => library}/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/AnimatedImageLoader.kt (100%) rename components/AnimatedImage/{components-animatedimage => library}/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/DesktopAnimatedImage.kt (100%) rename components/AnimatedImage/{components-animatedimage => library}/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/LocalAnimatedImageLoader.kt (100%) rename components/AnimatedImage/{components-animatedimage => library}/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/NetworkAnimatedImageLoader.kt (100%) rename components/AnimatedImage/{components-animatedimage => library}/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/ResourceAnimatedImageLoader.kt (100%) rename components/SplitPane/{components-splitpane-demo => demo}/build.gradle.kts (87%) rename components/SplitPane/{components-splitpane-demo => demo}/src/jvmMain/kotlin/org/jetbrains/compose/splitpane/demo/Main.kt (100%) rename components/SplitPane/{components-splitpane => library}/build.gradle.kts (100%) rename components/SplitPane/{components-splitpane => library}/src/commonMain/kotlin/org/jetbrains/compose/splitpane/ExperimentalSplitPaneApi.kt (100%) rename components/SplitPane/{components-splitpane => library}/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPane.kt (100%) rename components/SplitPane/{components-splitpane => library}/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPaneDSL.kt (100%) rename components/SplitPane/{components-splitpane => library}/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPaneState.kt (100%) rename components/SplitPane/{components-splitpane => library}/src/commonMain/kotlin/org/jetbrains/compose/splitpane/Splitter.kt (100%) rename components/SplitPane/{components-splitpane => library}/src/desktopMain/kotlin/org/jetbrains/compose/splitpane/DesktopSplitPane.kt (100%) rename components/SplitPane/{components-splitpane => library}/src/desktopMain/kotlin/org/jetbrains/compose/splitpane/DesktopSplitter.kt (100%) rename components/resources/{components-resources-demo => demo}/.gitignore (100%) rename components/resources/{components-resources-demo => demo}/androidApp/build.gradle.kts (90%) rename components/resources/{components-resources-demo => demo}/androidApp/src/main/AndroidManifest.xml (100%) rename components/resources/{components-resources-demo => demo}/androidApp/src/main/kotlin/org/jetbrains/compose/resources/demo/MainActivity.kt (100%) rename components/resources/{components-resources-demo => demo}/androidApp/src/main/res/values/strings.xml (100%) rename components/resources/{components-resources-demo => demo}/desktopApp/build.gradle.kts (79%) rename components/resources/{components-resources-demo => demo}/desktopApp/src/jvmMain/kotlin/Main.kt (100%) rename components/resources/{components-resources-demo => demo}/iosApp/Configuration/TeamId.xcconfig (100%) rename components/resources/{components-resources-demo => demo}/iosApp/iosApp.xcodeproj/project.pbxproj (100%) rename components/resources/{components-resources-demo => demo}/iosApp/iosApp/Info.plist (100%) rename components/resources/{components-resources-demo => demo}/iosApp/iosApp/iosApp.swift (100%) rename components/resources/{components-resources-demo => demo}/shared/build.gradle.kts (96%) rename components/resources/{components-resources-demo => demo}/shared/src/androidMain/assets/font_awesome.otf (100%) rename components/resources/{components-resources-demo => demo}/shared/src/androidMain/kotlin/org/jetbrains/compose/resources/demo/shared/main.android.kt (100%) rename components/resources/{components-resources-demo => demo}/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FileRes.kt (100%) rename components/resources/{components-resources-demo => demo}/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FontRes.kt (100%) rename components/resources/{components-resources-demo => demo}/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/ImagesRes.kt (100%) rename components/resources/{components-resources-demo => demo}/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/StringRes.kt (100%) rename components/resources/{components-resources-demo => demo}/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/UseResources.kt (100%) rename components/resources/{components-resources-demo => demo}/shared/src/commonMain/resources/font_awesome.otf (100%) rename components/resources/{components-resources-demo => demo}/shared/src/commonMain/resources/images/compose.png (100%) rename components/resources/{components-resources-demo => demo}/shared/src/commonMain/resources/images/droid_icon.xml (100%) rename components/resources/{components-resources-demo => demo}/shared/src/commonMain/resources/images/insta_icon.xml (100%) rename components/resources/{components-resources-demo => demo}/shared/src/commonMain/resources/images/land.webp (100%) rename components/resources/{components-resources-demo => demo}/shared/src/commonMain/resources/strings.xml (100%) rename components/resources/{components-resources-demo => demo}/shared/src/desktopMain/kotlin/org/jetbrains/compose/resources/demo/shared/main.desktop.kt (100%) rename components/resources/{components-resources-demo => demo}/shared/src/iosMain/kotlin/main.ios.kt (100%) rename components/resources/{components-resources-demo => demo}/shared/src/jsMain/kotlin/main.js.kt (100%) rename components/resources/{components-resources-demo => demo}/shared/src/jsMain/resources/index.html (100%) rename components/resources/{components-resources-demo => demo}/shared/src/macosMain/kotlin/main.macos.kt (100%) rename components/resources/{components-resources => library}/build.gradle.kts (100%) rename components/resources/{components-resources => library}/src/androidInstrumentedTest/assets/font_awesome.otf (100%) rename components/resources/{components-resources => library}/src/androidInstrumentedTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.android.kt (100%) rename components/resources/{components-resources => library}/src/androidMain/kotlin/org/jetbrains/compose/resources/FontResources.android.kt (100%) rename components/resources/{components-resources => library}/src/androidMain/kotlin/org/jetbrains/compose/resources/ImageResources.android.kt (100%) rename components/resources/{components-resources => library}/src/blockingMain/kotlin/org/jetbrains/compose/resources/PlatformState.blocking.kt (100%) rename components/resources/{components-resources => library}/src/blockingMain/kotlin/org/jetbrains/compose/resources/Resource.blocking.kt (100%) rename components/resources/{components-resources => library}/src/blockingTest/kotlin/org/jetbrains/compose/resources/TestUtils.blocking.kt (100%) rename components/resources/{components-resources => library}/src/commonMain/kotlin/org/jetbrains/compose/resources/FontResources.kt (100%) rename components/resources/{components-resources => library}/src/commonMain/kotlin/org/jetbrains/compose/resources/ImageResources.kt (100%) rename components/resources/{components-resources => library}/src/commonMain/kotlin/org/jetbrains/compose/resources/PlatformState.kt (100%) rename components/resources/{components-resources => library}/src/commonMain/kotlin/org/jetbrains/compose/resources/Resource.kt (100%) rename components/resources/{components-resources => library}/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceIndex.kt (100%) rename components/resources/{components-resources => library}/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceReader.kt (100%) rename components/resources/{components-resources => library}/src/commonMain/kotlin/org/jetbrains/compose/resources/StringResources.kt (100%) rename components/resources/{components-resources => library}/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/ValueParsers.kt (100%) rename components/resources/{components-resources => library}/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/XmlVectorParser.kt (100%) rename components/resources/{components-resources => library}/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/Element.kt (100%) rename components/resources/{components-resources => library}/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/MalformedXMLException.kt (100%) rename components/resources/{components-resources => library}/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/Node.kt (100%) rename components/resources/{components-resources => library}/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeList.kt (100%) rename components/resources/{components-resources => library}/src/commonTest/kotlin/org/jetbrains/compose/resources/RecompositionsCounter.kt (100%) rename components/resources/{components-resources => library}/src/commonTest/kotlin/org/jetbrains/compose/resources/ResourceTest.kt (100%) rename components/resources/{components-resources => library}/src/commonTest/kotlin/org/jetbrains/compose/resources/TestResourceReader.kt (100%) rename components/resources/{components-resources => library}/src/commonTest/kotlin/org/jetbrains/compose/resources/TestUtils.kt (100%) rename components/resources/{components-resources => library}/src/commonTest/resources/1.png (100%) rename components/resources/{components-resources => library}/src/commonTest/resources/2.png (100%) rename components/resources/{components-resources => library}/src/commonTest/resources/font_awesome.otf (100%) rename components/resources/{components-resources => library}/src/commonTest/resources/strings.xml (100%) rename components/resources/{components-resources => library}/src/desktopTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.desktop.kt (100%) rename components/resources/{components-resources => library}/src/iosMain/kotlin/org/jetbrains/compose/resources/ResourceReader.ios.kt (100%) rename components/resources/{components-resources => library}/src/jsMain/kotlin/org/jetbrains/compose/resources/ImageResources.js.kt (100%) rename components/resources/{components-resources => library}/src/jsMain/kotlin/org/jetbrains/compose/resources/PlatformState.js.kt (100%) rename components/resources/{components-resources => library}/src/jsMain/kotlin/org/jetbrains/compose/resources/Resource.js.kt (100%) rename components/resources/{components-resources => library}/src/jsMain/kotlin/org/jetbrains/compose/resources/ResourceReader.js.kt (100%) rename components/resources/{components-resources => library}/src/jsMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/ElementImpl.kt (100%) rename components/resources/{components-resources => library}/src/jsMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeImpl.kt (100%) rename components/resources/{components-resources => library}/src/jsTest/kotlin/org/jetbrains/compose/resources/TestUtils.js.kt (100%) rename components/resources/{components-resources => library}/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/ImageResources.jvmAndAndroid.kt (100%) rename components/resources/{components-resources => library}/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/ResourceReader.jvmAndAndroid.kt (100%) rename components/resources/{components-resources => library}/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/ElementImpl.kt (100%) rename components/resources/{components-resources => library}/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeImpl.kt (100%) rename components/resources/{components-resources => library}/src/macosMain/kotlin/org/jetbrains/compose/resources/ResourceReader.macos.kt (100%) rename components/resources/{components-resources => library}/src/nativeMain/kotlin/org/jetbrains/compose/resources/ImageResources.native.kt (100%) rename components/resources/{components-resources => library}/src/nativeMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/DomXmlParser.kt (100%) rename components/resources/{components-resources => library}/src/skikoMain/kotlin/org/jetbrains/compose/resources/FontResources.skiko.kt (100%) rename components/resources/{components-resources => library}/src/skikoMain/kotlin/org/jetbrains/compose/resources/ImageResources.skiko.kt (100%) rename components/ui-tooling-preview/{components-ui-tooling-preview-demo => demo}/desktopApp/build.gradle.kts (76%) rename components/ui-tooling-preview/{components-ui-tooling-preview-demo => demo}/desktopApp/src/jvmMain/kotlin/Main.kt (100%) rename components/ui-tooling-preview/{components-ui-tooling-preview-demo => demo}/shared/build.gradle.kts (95%) rename components/ui-tooling-preview/{components-ui-tooling-preview-demo => demo}/shared/src/commonMain/kotlin/org/jetbrains/compose/preview/demo/shared/UsePreviewAnnotation.kt (100%) rename components/ui-tooling-preview/{components-ui-tooling-preview-demo => demo}/shared/src/desktopMain/kotlin/org/jetbrains/compose/preview/demo/shared/main.desktop.kt (100%) rename components/ui-tooling-preview/{components-ui-tooling-preview => library}/build.gradle.kts (100%) rename components/ui-tooling-preview/{components-ui-tooling-preview => library}/src/commonMain/kotlin/org/jetbrains/compose/ui/tooling/preview/Preview.kt (100%) rename components/ui-tooling-preview/{components-ui-tooling-preview => library}/src/commonMain/kotlin/org/jetbrains/compose/ui/tooling/preview/PreviewParameter.kt (100%) diff --git a/components/AnimatedImage/components-animatedimage-demo/build.gradle.kts b/components/AnimatedImage/demo/build.gradle.kts similarity index 85% rename from components/AnimatedImage/components-animatedimage-demo/build.gradle.kts rename to components/AnimatedImage/demo/build.gradle.kts index 58b28ede4f..6c36cc912b 100644 --- a/components/AnimatedImage/components-animatedimage-demo/build.gradle.kts +++ b/components/AnimatedImage/demo/build.gradle.kts @@ -14,7 +14,7 @@ kotlin { val jvmMain by getting { dependencies { implementation(compose.desktop.currentOs) - implementation(project(":AnimatedImage:components-animatedimage")) + implementation(project(":AnimatedImage:library")) } } } diff --git a/components/AnimatedImage/components-animatedimage-demo/src/jvmMain/kotlin/org/jetbrains/compose/animatedimage/demo/Main.kt b/components/AnimatedImage/demo/src/jvmMain/kotlin/org/jetbrains/compose/animatedimage/demo/Main.kt similarity index 100% rename from components/AnimatedImage/components-animatedimage-demo/src/jvmMain/kotlin/org/jetbrains/compose/animatedimage/demo/Main.kt rename to components/AnimatedImage/demo/src/jvmMain/kotlin/org/jetbrains/compose/animatedimage/demo/Main.kt diff --git a/components/AnimatedImage/components-animatedimage-demo/src/jvmMain/resources/demo.webp b/components/AnimatedImage/demo/src/jvmMain/resources/demo.webp similarity index 100% rename from components/AnimatedImage/components-animatedimage-demo/src/jvmMain/resources/demo.webp rename to components/AnimatedImage/demo/src/jvmMain/resources/demo.webp diff --git a/components/AnimatedImage/components-animatedimage/build.gradle.kts b/components/AnimatedImage/library/build.gradle.kts similarity index 100% rename from components/AnimatedImage/components-animatedimage/build.gradle.kts rename to components/AnimatedImage/library/build.gradle.kts diff --git a/components/AnimatedImage/components-animatedimage/src/commonMain/kotlin/org/jetbrains/compose/animatedimage/AnimatedImage.kt b/components/AnimatedImage/library/src/commonMain/kotlin/org/jetbrains/compose/animatedimage/AnimatedImage.kt similarity index 100% rename from components/AnimatedImage/components-animatedimage/src/commonMain/kotlin/org/jetbrains/compose/animatedimage/AnimatedImage.kt rename to components/AnimatedImage/library/src/commonMain/kotlin/org/jetbrains/compose/animatedimage/AnimatedImage.kt diff --git a/components/AnimatedImage/components-animatedimage/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/AnimatedImageLoader.kt b/components/AnimatedImage/library/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/AnimatedImageLoader.kt similarity index 100% rename from components/AnimatedImage/components-animatedimage/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/AnimatedImageLoader.kt rename to components/AnimatedImage/library/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/AnimatedImageLoader.kt diff --git a/components/AnimatedImage/components-animatedimage/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/DesktopAnimatedImage.kt b/components/AnimatedImage/library/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/DesktopAnimatedImage.kt similarity index 100% rename from components/AnimatedImage/components-animatedimage/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/DesktopAnimatedImage.kt rename to components/AnimatedImage/library/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/DesktopAnimatedImage.kt diff --git a/components/AnimatedImage/components-animatedimage/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/LocalAnimatedImageLoader.kt b/components/AnimatedImage/library/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/LocalAnimatedImageLoader.kt similarity index 100% rename from components/AnimatedImage/components-animatedimage/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/LocalAnimatedImageLoader.kt rename to components/AnimatedImage/library/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/LocalAnimatedImageLoader.kt diff --git a/components/AnimatedImage/components-animatedimage/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/NetworkAnimatedImageLoader.kt b/components/AnimatedImage/library/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/NetworkAnimatedImageLoader.kt similarity index 100% rename from components/AnimatedImage/components-animatedimage/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/NetworkAnimatedImageLoader.kt rename to components/AnimatedImage/library/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/NetworkAnimatedImageLoader.kt diff --git a/components/AnimatedImage/components-animatedimage/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/ResourceAnimatedImageLoader.kt b/components/AnimatedImage/library/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/ResourceAnimatedImageLoader.kt similarity index 100% rename from components/AnimatedImage/components-animatedimage/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/ResourceAnimatedImageLoader.kt rename to components/AnimatedImage/library/src/desktopMain/kotlin/org/jetbrains/compose/animatedimage/ResourceAnimatedImageLoader.kt diff --git a/components/SplitPane/components-splitpane-demo/build.gradle.kts b/components/SplitPane/demo/build.gradle.kts similarity index 87% rename from components/SplitPane/components-splitpane-demo/build.gradle.kts rename to components/SplitPane/demo/build.gradle.kts index 3496fae60d..8ef6caaa6b 100644 --- a/components/SplitPane/components-splitpane-demo/build.gradle.kts +++ b/components/SplitPane/demo/build.gradle.kts @@ -17,7 +17,7 @@ kotlin { val jvmMain by getting { dependencies { implementation(compose.desktop.currentOs) - implementation(project(":SplitPane:components-splitpane")) + implementation(project(":SplitPane:library")) } } } diff --git a/components/SplitPane/components-splitpane-demo/src/jvmMain/kotlin/org/jetbrains/compose/splitpane/demo/Main.kt b/components/SplitPane/demo/src/jvmMain/kotlin/org/jetbrains/compose/splitpane/demo/Main.kt similarity index 100% rename from components/SplitPane/components-splitpane-demo/src/jvmMain/kotlin/org/jetbrains/compose/splitpane/demo/Main.kt rename to components/SplitPane/demo/src/jvmMain/kotlin/org/jetbrains/compose/splitpane/demo/Main.kt diff --git a/components/SplitPane/components-splitpane/build.gradle.kts b/components/SplitPane/library/build.gradle.kts similarity index 100% rename from components/SplitPane/components-splitpane/build.gradle.kts rename to components/SplitPane/library/build.gradle.kts diff --git a/components/SplitPane/components-splitpane/src/commonMain/kotlin/org/jetbrains/compose/splitpane/ExperimentalSplitPaneApi.kt b/components/SplitPane/library/src/commonMain/kotlin/org/jetbrains/compose/splitpane/ExperimentalSplitPaneApi.kt similarity index 100% rename from components/SplitPane/components-splitpane/src/commonMain/kotlin/org/jetbrains/compose/splitpane/ExperimentalSplitPaneApi.kt rename to components/SplitPane/library/src/commonMain/kotlin/org/jetbrains/compose/splitpane/ExperimentalSplitPaneApi.kt diff --git a/components/SplitPane/components-splitpane/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPane.kt b/components/SplitPane/library/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPane.kt similarity index 100% rename from components/SplitPane/components-splitpane/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPane.kt rename to components/SplitPane/library/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPane.kt diff --git a/components/SplitPane/components-splitpane/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPaneDSL.kt b/components/SplitPane/library/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPaneDSL.kt similarity index 100% rename from components/SplitPane/components-splitpane/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPaneDSL.kt rename to components/SplitPane/library/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPaneDSL.kt diff --git a/components/SplitPane/components-splitpane/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPaneState.kt b/components/SplitPane/library/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPaneState.kt similarity index 100% rename from components/SplitPane/components-splitpane/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPaneState.kt rename to components/SplitPane/library/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPaneState.kt diff --git a/components/SplitPane/components-splitpane/src/commonMain/kotlin/org/jetbrains/compose/splitpane/Splitter.kt b/components/SplitPane/library/src/commonMain/kotlin/org/jetbrains/compose/splitpane/Splitter.kt similarity index 100% rename from components/SplitPane/components-splitpane/src/commonMain/kotlin/org/jetbrains/compose/splitpane/Splitter.kt rename to components/SplitPane/library/src/commonMain/kotlin/org/jetbrains/compose/splitpane/Splitter.kt diff --git a/components/SplitPane/components-splitpane/src/desktopMain/kotlin/org/jetbrains/compose/splitpane/DesktopSplitPane.kt b/components/SplitPane/library/src/desktopMain/kotlin/org/jetbrains/compose/splitpane/DesktopSplitPane.kt similarity index 100% rename from components/SplitPane/components-splitpane/src/desktopMain/kotlin/org/jetbrains/compose/splitpane/DesktopSplitPane.kt rename to components/SplitPane/library/src/desktopMain/kotlin/org/jetbrains/compose/splitpane/DesktopSplitPane.kt diff --git a/components/SplitPane/components-splitpane/src/desktopMain/kotlin/org/jetbrains/compose/splitpane/DesktopSplitter.kt b/components/SplitPane/library/src/desktopMain/kotlin/org/jetbrains/compose/splitpane/DesktopSplitter.kt similarity index 100% rename from components/SplitPane/components-splitpane/src/desktopMain/kotlin/org/jetbrains/compose/splitpane/DesktopSplitter.kt rename to components/SplitPane/library/src/desktopMain/kotlin/org/jetbrains/compose/splitpane/DesktopSplitter.kt diff --git a/components/resources/components-resources-demo/.gitignore b/components/resources/demo/.gitignore similarity index 100% rename from components/resources/components-resources-demo/.gitignore rename to components/resources/demo/.gitignore diff --git a/components/resources/components-resources-demo/androidApp/build.gradle.kts b/components/resources/demo/androidApp/build.gradle.kts similarity index 90% rename from components/resources/components-resources-demo/androidApp/build.gradle.kts rename to components/resources/demo/androidApp/build.gradle.kts index 7aadb66e28..122f5e1123 100644 --- a/components/resources/components-resources-demo/androidApp/build.gradle.kts +++ b/components/resources/demo/androidApp/build.gradle.kts @@ -19,7 +19,7 @@ android { targetCompatibility = JavaVersion.VERSION_11 } dependencies { - implementation(project(":resources:components-resources-demo:shared")) + implementation(project(":resources:demo:shared")) implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.activity:activity-compose:1.8.0") implementation("androidx.compose.foundation:foundation:1.5.3") diff --git a/components/resources/components-resources-demo/androidApp/src/main/AndroidManifest.xml b/components/resources/demo/androidApp/src/main/AndroidManifest.xml similarity index 100% rename from components/resources/components-resources-demo/androidApp/src/main/AndroidManifest.xml rename to components/resources/demo/androidApp/src/main/AndroidManifest.xml diff --git a/components/resources/components-resources-demo/androidApp/src/main/kotlin/org/jetbrains/compose/resources/demo/MainActivity.kt b/components/resources/demo/androidApp/src/main/kotlin/org/jetbrains/compose/resources/demo/MainActivity.kt similarity index 100% rename from components/resources/components-resources-demo/androidApp/src/main/kotlin/org/jetbrains/compose/resources/demo/MainActivity.kt rename to components/resources/demo/androidApp/src/main/kotlin/org/jetbrains/compose/resources/demo/MainActivity.kt diff --git a/components/resources/components-resources-demo/androidApp/src/main/res/values/strings.xml b/components/resources/demo/androidApp/src/main/res/values/strings.xml similarity index 100% rename from components/resources/components-resources-demo/androidApp/src/main/res/values/strings.xml rename to components/resources/demo/androidApp/src/main/res/values/strings.xml diff --git a/components/resources/components-resources-demo/desktopApp/build.gradle.kts b/components/resources/demo/desktopApp/build.gradle.kts similarity index 79% rename from components/resources/components-resources-demo/desktopApp/build.gradle.kts rename to components/resources/demo/desktopApp/build.gradle.kts index 09891a2059..279ae99206 100644 --- a/components/resources/components-resources-demo/desktopApp/build.gradle.kts +++ b/components/resources/demo/desktopApp/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { val jvmMain by getting { dependencies { implementation(compose.desktop.currentOs) - implementation(project(":resources:components-resources-demo:shared")) + implementation(project(":resources:demo:shared")) } } } diff --git a/components/resources/components-resources-demo/desktopApp/src/jvmMain/kotlin/Main.kt b/components/resources/demo/desktopApp/src/jvmMain/kotlin/Main.kt similarity index 100% rename from components/resources/components-resources-demo/desktopApp/src/jvmMain/kotlin/Main.kt rename to components/resources/demo/desktopApp/src/jvmMain/kotlin/Main.kt diff --git a/components/resources/components-resources-demo/iosApp/Configuration/TeamId.xcconfig b/components/resources/demo/iosApp/Configuration/TeamId.xcconfig similarity index 100% rename from components/resources/components-resources-demo/iosApp/Configuration/TeamId.xcconfig rename to components/resources/demo/iosApp/Configuration/TeamId.xcconfig diff --git a/components/resources/components-resources-demo/iosApp/iosApp.xcodeproj/project.pbxproj b/components/resources/demo/iosApp/iosApp.xcodeproj/project.pbxproj similarity index 100% rename from components/resources/components-resources-demo/iosApp/iosApp.xcodeproj/project.pbxproj rename to components/resources/demo/iosApp/iosApp.xcodeproj/project.pbxproj diff --git a/components/resources/components-resources-demo/iosApp/iosApp/Info.plist b/components/resources/demo/iosApp/iosApp/Info.plist similarity index 100% rename from components/resources/components-resources-demo/iosApp/iosApp/Info.plist rename to components/resources/demo/iosApp/iosApp/Info.plist diff --git a/components/resources/components-resources-demo/iosApp/iosApp/iosApp.swift b/components/resources/demo/iosApp/iosApp/iosApp.swift similarity index 100% rename from components/resources/components-resources-demo/iosApp/iosApp/iosApp.swift rename to components/resources/demo/iosApp/iosApp/iosApp.swift diff --git a/components/resources/components-resources-demo/shared/build.gradle.kts b/components/resources/demo/shared/build.gradle.kts similarity index 96% rename from components/resources/components-resources-demo/shared/build.gradle.kts rename to components/resources/demo/shared/build.gradle.kts index bf7f2fc310..e3c500f0f7 100644 --- a/components/resources/components-resources-demo/shared/build.gradle.kts +++ b/components/resources/demo/shared/build.gradle.kts @@ -57,7 +57,7 @@ kotlin { dependencies { implementation(compose.runtime) implementation(compose.material3) - implementation(project(":resources:components-resources")) + implementation(project(":resources:library")) } } val desktopMain by getting { diff --git a/components/resources/components-resources-demo/shared/src/androidMain/assets/font_awesome.otf b/components/resources/demo/shared/src/androidMain/assets/font_awesome.otf similarity index 100% rename from components/resources/components-resources-demo/shared/src/androidMain/assets/font_awesome.otf rename to components/resources/demo/shared/src/androidMain/assets/font_awesome.otf diff --git a/components/resources/components-resources-demo/shared/src/androidMain/kotlin/org/jetbrains/compose/resources/demo/shared/main.android.kt b/components/resources/demo/shared/src/androidMain/kotlin/org/jetbrains/compose/resources/demo/shared/main.android.kt similarity index 100% rename from components/resources/components-resources-demo/shared/src/androidMain/kotlin/org/jetbrains/compose/resources/demo/shared/main.android.kt rename to components/resources/demo/shared/src/androidMain/kotlin/org/jetbrains/compose/resources/demo/shared/main.android.kt diff --git a/components/resources/components-resources-demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FileRes.kt b/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FileRes.kt similarity index 100% rename from components/resources/components-resources-demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FileRes.kt rename to components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FileRes.kt diff --git a/components/resources/components-resources-demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FontRes.kt b/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FontRes.kt similarity index 100% rename from components/resources/components-resources-demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FontRes.kt rename to components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FontRes.kt diff --git a/components/resources/components-resources-demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/ImagesRes.kt b/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/ImagesRes.kt similarity index 100% rename from components/resources/components-resources-demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/ImagesRes.kt rename to components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/ImagesRes.kt diff --git a/components/resources/components-resources-demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/StringRes.kt b/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/StringRes.kt similarity index 100% rename from components/resources/components-resources-demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/StringRes.kt rename to components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/StringRes.kt diff --git a/components/resources/components-resources-demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/UseResources.kt b/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/UseResources.kt similarity index 100% rename from components/resources/components-resources-demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/UseResources.kt rename to components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/UseResources.kt diff --git a/components/resources/components-resources-demo/shared/src/commonMain/resources/font_awesome.otf b/components/resources/demo/shared/src/commonMain/resources/font_awesome.otf similarity index 100% rename from components/resources/components-resources-demo/shared/src/commonMain/resources/font_awesome.otf rename to components/resources/demo/shared/src/commonMain/resources/font_awesome.otf diff --git a/components/resources/components-resources-demo/shared/src/commonMain/resources/images/compose.png b/components/resources/demo/shared/src/commonMain/resources/images/compose.png similarity index 100% rename from components/resources/components-resources-demo/shared/src/commonMain/resources/images/compose.png rename to components/resources/demo/shared/src/commonMain/resources/images/compose.png diff --git a/components/resources/components-resources-demo/shared/src/commonMain/resources/images/droid_icon.xml b/components/resources/demo/shared/src/commonMain/resources/images/droid_icon.xml similarity index 100% rename from components/resources/components-resources-demo/shared/src/commonMain/resources/images/droid_icon.xml rename to components/resources/demo/shared/src/commonMain/resources/images/droid_icon.xml diff --git a/components/resources/components-resources-demo/shared/src/commonMain/resources/images/insta_icon.xml b/components/resources/demo/shared/src/commonMain/resources/images/insta_icon.xml similarity index 100% rename from components/resources/components-resources-demo/shared/src/commonMain/resources/images/insta_icon.xml rename to components/resources/demo/shared/src/commonMain/resources/images/insta_icon.xml diff --git a/components/resources/components-resources-demo/shared/src/commonMain/resources/images/land.webp b/components/resources/demo/shared/src/commonMain/resources/images/land.webp similarity index 100% rename from components/resources/components-resources-demo/shared/src/commonMain/resources/images/land.webp rename to components/resources/demo/shared/src/commonMain/resources/images/land.webp diff --git a/components/resources/components-resources-demo/shared/src/commonMain/resources/strings.xml b/components/resources/demo/shared/src/commonMain/resources/strings.xml similarity index 100% rename from components/resources/components-resources-demo/shared/src/commonMain/resources/strings.xml rename to components/resources/demo/shared/src/commonMain/resources/strings.xml diff --git a/components/resources/components-resources-demo/shared/src/desktopMain/kotlin/org/jetbrains/compose/resources/demo/shared/main.desktop.kt b/components/resources/demo/shared/src/desktopMain/kotlin/org/jetbrains/compose/resources/demo/shared/main.desktop.kt similarity index 100% rename from components/resources/components-resources-demo/shared/src/desktopMain/kotlin/org/jetbrains/compose/resources/demo/shared/main.desktop.kt rename to components/resources/demo/shared/src/desktopMain/kotlin/org/jetbrains/compose/resources/demo/shared/main.desktop.kt diff --git a/components/resources/components-resources-demo/shared/src/iosMain/kotlin/main.ios.kt b/components/resources/demo/shared/src/iosMain/kotlin/main.ios.kt similarity index 100% rename from components/resources/components-resources-demo/shared/src/iosMain/kotlin/main.ios.kt rename to components/resources/demo/shared/src/iosMain/kotlin/main.ios.kt diff --git a/components/resources/components-resources-demo/shared/src/jsMain/kotlin/main.js.kt b/components/resources/demo/shared/src/jsMain/kotlin/main.js.kt similarity index 100% rename from components/resources/components-resources-demo/shared/src/jsMain/kotlin/main.js.kt rename to components/resources/demo/shared/src/jsMain/kotlin/main.js.kt diff --git a/components/resources/components-resources-demo/shared/src/jsMain/resources/index.html b/components/resources/demo/shared/src/jsMain/resources/index.html similarity index 100% rename from components/resources/components-resources-demo/shared/src/jsMain/resources/index.html rename to components/resources/demo/shared/src/jsMain/resources/index.html diff --git a/components/resources/components-resources-demo/shared/src/macosMain/kotlin/main.macos.kt b/components/resources/demo/shared/src/macosMain/kotlin/main.macos.kt similarity index 100% rename from components/resources/components-resources-demo/shared/src/macosMain/kotlin/main.macos.kt rename to components/resources/demo/shared/src/macosMain/kotlin/main.macos.kt diff --git a/components/resources/components-resources/build.gradle.kts b/components/resources/library/build.gradle.kts similarity index 100% rename from components/resources/components-resources/build.gradle.kts rename to components/resources/library/build.gradle.kts diff --git a/components/resources/components-resources/src/androidInstrumentedTest/assets/font_awesome.otf b/components/resources/library/src/androidInstrumentedTest/assets/font_awesome.otf similarity index 100% rename from components/resources/components-resources/src/androidInstrumentedTest/assets/font_awesome.otf rename to components/resources/library/src/androidInstrumentedTest/assets/font_awesome.otf diff --git a/components/resources/components-resources/src/androidInstrumentedTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.android.kt b/components/resources/library/src/androidInstrumentedTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.android.kt similarity index 100% rename from components/resources/components-resources/src/androidInstrumentedTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.android.kt rename to components/resources/library/src/androidInstrumentedTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.android.kt diff --git a/components/resources/components-resources/src/androidMain/kotlin/org/jetbrains/compose/resources/FontResources.android.kt b/components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/FontResources.android.kt similarity index 100% rename from components/resources/components-resources/src/androidMain/kotlin/org/jetbrains/compose/resources/FontResources.android.kt rename to components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/FontResources.android.kt diff --git a/components/resources/components-resources/src/androidMain/kotlin/org/jetbrains/compose/resources/ImageResources.android.kt b/components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/ImageResources.android.kt similarity index 100% rename from components/resources/components-resources/src/androidMain/kotlin/org/jetbrains/compose/resources/ImageResources.android.kt rename to components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/ImageResources.android.kt diff --git a/components/resources/components-resources/src/blockingMain/kotlin/org/jetbrains/compose/resources/PlatformState.blocking.kt b/components/resources/library/src/blockingMain/kotlin/org/jetbrains/compose/resources/PlatformState.blocking.kt similarity index 100% rename from components/resources/components-resources/src/blockingMain/kotlin/org/jetbrains/compose/resources/PlatformState.blocking.kt rename to components/resources/library/src/blockingMain/kotlin/org/jetbrains/compose/resources/PlatformState.blocking.kt diff --git a/components/resources/components-resources/src/blockingMain/kotlin/org/jetbrains/compose/resources/Resource.blocking.kt b/components/resources/library/src/blockingMain/kotlin/org/jetbrains/compose/resources/Resource.blocking.kt similarity index 100% rename from components/resources/components-resources/src/blockingMain/kotlin/org/jetbrains/compose/resources/Resource.blocking.kt rename to components/resources/library/src/blockingMain/kotlin/org/jetbrains/compose/resources/Resource.blocking.kt diff --git a/components/resources/components-resources/src/blockingTest/kotlin/org/jetbrains/compose/resources/TestUtils.blocking.kt b/components/resources/library/src/blockingTest/kotlin/org/jetbrains/compose/resources/TestUtils.blocking.kt similarity index 100% rename from components/resources/components-resources/src/blockingTest/kotlin/org/jetbrains/compose/resources/TestUtils.blocking.kt rename to components/resources/library/src/blockingTest/kotlin/org/jetbrains/compose/resources/TestUtils.blocking.kt diff --git a/components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/FontResources.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/FontResources.kt similarity index 100% rename from components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/FontResources.kt rename to components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/FontResources.kt diff --git a/components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/ImageResources.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/ImageResources.kt similarity index 100% rename from components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/ImageResources.kt rename to components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/ImageResources.kt diff --git a/components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/PlatformState.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/PlatformState.kt similarity index 100% rename from components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/PlatformState.kt rename to components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/PlatformState.kt diff --git a/components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/Resource.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/Resource.kt similarity index 100% rename from components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/Resource.kt rename to components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/Resource.kt diff --git a/components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceIndex.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceIndex.kt similarity index 100% rename from components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceIndex.kt rename to components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceIndex.kt diff --git a/components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceReader.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceReader.kt similarity index 100% rename from components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceReader.kt rename to components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceReader.kt diff --git a/components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/StringResources.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/StringResources.kt similarity index 100% rename from components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/StringResources.kt rename to components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/StringResources.kt diff --git a/components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/ValueParsers.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/ValueParsers.kt similarity index 100% rename from components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/ValueParsers.kt rename to components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/ValueParsers.kt diff --git a/components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/XmlVectorParser.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/XmlVectorParser.kt similarity index 100% rename from components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/XmlVectorParser.kt rename to components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/XmlVectorParser.kt diff --git a/components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/Element.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/Element.kt similarity index 100% rename from components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/Element.kt rename to components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/Element.kt diff --git a/components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/MalformedXMLException.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/MalformedXMLException.kt similarity index 100% rename from components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/MalformedXMLException.kt rename to components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/MalformedXMLException.kt diff --git a/components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/Node.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/Node.kt similarity index 100% rename from components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/Node.kt rename to components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/Node.kt diff --git a/components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeList.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeList.kt similarity index 100% rename from components/resources/components-resources/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeList.kt rename to components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeList.kt diff --git a/components/resources/components-resources/src/commonTest/kotlin/org/jetbrains/compose/resources/RecompositionsCounter.kt b/components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/RecompositionsCounter.kt similarity index 100% rename from components/resources/components-resources/src/commonTest/kotlin/org/jetbrains/compose/resources/RecompositionsCounter.kt rename to components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/RecompositionsCounter.kt diff --git a/components/resources/components-resources/src/commonTest/kotlin/org/jetbrains/compose/resources/ResourceTest.kt b/components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/ResourceTest.kt similarity index 100% rename from components/resources/components-resources/src/commonTest/kotlin/org/jetbrains/compose/resources/ResourceTest.kt rename to components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/ResourceTest.kt diff --git a/components/resources/components-resources/src/commonTest/kotlin/org/jetbrains/compose/resources/TestResourceReader.kt b/components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/TestResourceReader.kt similarity index 100% rename from components/resources/components-resources/src/commonTest/kotlin/org/jetbrains/compose/resources/TestResourceReader.kt rename to components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/TestResourceReader.kt diff --git a/components/resources/components-resources/src/commonTest/kotlin/org/jetbrains/compose/resources/TestUtils.kt b/components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/TestUtils.kt similarity index 100% rename from components/resources/components-resources/src/commonTest/kotlin/org/jetbrains/compose/resources/TestUtils.kt rename to components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/TestUtils.kt diff --git a/components/resources/components-resources/src/commonTest/resources/1.png b/components/resources/library/src/commonTest/resources/1.png similarity index 100% rename from components/resources/components-resources/src/commonTest/resources/1.png rename to components/resources/library/src/commonTest/resources/1.png diff --git a/components/resources/components-resources/src/commonTest/resources/2.png b/components/resources/library/src/commonTest/resources/2.png similarity index 100% rename from components/resources/components-resources/src/commonTest/resources/2.png rename to components/resources/library/src/commonTest/resources/2.png diff --git a/components/resources/components-resources/src/commonTest/resources/font_awesome.otf b/components/resources/library/src/commonTest/resources/font_awesome.otf similarity index 100% rename from components/resources/components-resources/src/commonTest/resources/font_awesome.otf rename to components/resources/library/src/commonTest/resources/font_awesome.otf diff --git a/components/resources/components-resources/src/commonTest/resources/strings.xml b/components/resources/library/src/commonTest/resources/strings.xml similarity index 100% rename from components/resources/components-resources/src/commonTest/resources/strings.xml rename to components/resources/library/src/commonTest/resources/strings.xml diff --git a/components/resources/components-resources/src/desktopTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.desktop.kt b/components/resources/library/src/desktopTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.desktop.kt similarity index 100% rename from components/resources/components-resources/src/desktopTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.desktop.kt rename to components/resources/library/src/desktopTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.desktop.kt diff --git a/components/resources/components-resources/src/iosMain/kotlin/org/jetbrains/compose/resources/ResourceReader.ios.kt b/components/resources/library/src/iosMain/kotlin/org/jetbrains/compose/resources/ResourceReader.ios.kt similarity index 100% rename from components/resources/components-resources/src/iosMain/kotlin/org/jetbrains/compose/resources/ResourceReader.ios.kt rename to components/resources/library/src/iosMain/kotlin/org/jetbrains/compose/resources/ResourceReader.ios.kt diff --git a/components/resources/components-resources/src/jsMain/kotlin/org/jetbrains/compose/resources/ImageResources.js.kt b/components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/ImageResources.js.kt similarity index 100% rename from components/resources/components-resources/src/jsMain/kotlin/org/jetbrains/compose/resources/ImageResources.js.kt rename to components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/ImageResources.js.kt diff --git a/components/resources/components-resources/src/jsMain/kotlin/org/jetbrains/compose/resources/PlatformState.js.kt b/components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/PlatformState.js.kt similarity index 100% rename from components/resources/components-resources/src/jsMain/kotlin/org/jetbrains/compose/resources/PlatformState.js.kt rename to components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/PlatformState.js.kt diff --git a/components/resources/components-resources/src/jsMain/kotlin/org/jetbrains/compose/resources/Resource.js.kt b/components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/Resource.js.kt similarity index 100% rename from components/resources/components-resources/src/jsMain/kotlin/org/jetbrains/compose/resources/Resource.js.kt rename to components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/Resource.js.kt diff --git a/components/resources/components-resources/src/jsMain/kotlin/org/jetbrains/compose/resources/ResourceReader.js.kt b/components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/ResourceReader.js.kt similarity index 100% rename from components/resources/components-resources/src/jsMain/kotlin/org/jetbrains/compose/resources/ResourceReader.js.kt rename to components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/ResourceReader.js.kt diff --git a/components/resources/components-resources/src/jsMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/ElementImpl.kt b/components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/ElementImpl.kt similarity index 100% rename from components/resources/components-resources/src/jsMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/ElementImpl.kt rename to components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/ElementImpl.kt diff --git a/components/resources/components-resources/src/jsMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeImpl.kt b/components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeImpl.kt similarity index 100% rename from components/resources/components-resources/src/jsMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeImpl.kt rename to components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeImpl.kt diff --git a/components/resources/components-resources/src/jsTest/kotlin/org/jetbrains/compose/resources/TestUtils.js.kt b/components/resources/library/src/jsTest/kotlin/org/jetbrains/compose/resources/TestUtils.js.kt similarity index 100% rename from components/resources/components-resources/src/jsTest/kotlin/org/jetbrains/compose/resources/TestUtils.js.kt rename to components/resources/library/src/jsTest/kotlin/org/jetbrains/compose/resources/TestUtils.js.kt diff --git a/components/resources/components-resources/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/ImageResources.jvmAndAndroid.kt b/components/resources/library/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/ImageResources.jvmAndAndroid.kt similarity index 100% rename from components/resources/components-resources/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/ImageResources.jvmAndAndroid.kt rename to components/resources/library/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/ImageResources.jvmAndAndroid.kt diff --git a/components/resources/components-resources/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/ResourceReader.jvmAndAndroid.kt b/components/resources/library/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/ResourceReader.jvmAndAndroid.kt similarity index 100% rename from components/resources/components-resources/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/ResourceReader.jvmAndAndroid.kt rename to components/resources/library/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/ResourceReader.jvmAndAndroid.kt diff --git a/components/resources/components-resources/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/ElementImpl.kt b/components/resources/library/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/ElementImpl.kt similarity index 100% rename from components/resources/components-resources/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/ElementImpl.kt rename to components/resources/library/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/ElementImpl.kt diff --git a/components/resources/components-resources/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeImpl.kt b/components/resources/library/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeImpl.kt similarity index 100% rename from components/resources/components-resources/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeImpl.kt rename to components/resources/library/src/jvmAndAndroidMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/NodeImpl.kt diff --git a/components/resources/components-resources/src/macosMain/kotlin/org/jetbrains/compose/resources/ResourceReader.macos.kt b/components/resources/library/src/macosMain/kotlin/org/jetbrains/compose/resources/ResourceReader.macos.kt similarity index 100% rename from components/resources/components-resources/src/macosMain/kotlin/org/jetbrains/compose/resources/ResourceReader.macos.kt rename to components/resources/library/src/macosMain/kotlin/org/jetbrains/compose/resources/ResourceReader.macos.kt diff --git a/components/resources/components-resources/src/nativeMain/kotlin/org/jetbrains/compose/resources/ImageResources.native.kt b/components/resources/library/src/nativeMain/kotlin/org/jetbrains/compose/resources/ImageResources.native.kt similarity index 100% rename from components/resources/components-resources/src/nativeMain/kotlin/org/jetbrains/compose/resources/ImageResources.native.kt rename to components/resources/library/src/nativeMain/kotlin/org/jetbrains/compose/resources/ImageResources.native.kt diff --git a/components/resources/components-resources/src/nativeMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/DomXmlParser.kt b/components/resources/library/src/nativeMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/DomXmlParser.kt similarity index 100% rename from components/resources/components-resources/src/nativeMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/DomXmlParser.kt rename to components/resources/library/src/nativeMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/DomXmlParser.kt diff --git a/components/resources/components-resources/src/skikoMain/kotlin/org/jetbrains/compose/resources/FontResources.skiko.kt b/components/resources/library/src/skikoMain/kotlin/org/jetbrains/compose/resources/FontResources.skiko.kt similarity index 100% rename from components/resources/components-resources/src/skikoMain/kotlin/org/jetbrains/compose/resources/FontResources.skiko.kt rename to components/resources/library/src/skikoMain/kotlin/org/jetbrains/compose/resources/FontResources.skiko.kt diff --git a/components/resources/components-resources/src/skikoMain/kotlin/org/jetbrains/compose/resources/ImageResources.skiko.kt b/components/resources/library/src/skikoMain/kotlin/org/jetbrains/compose/resources/ImageResources.skiko.kt similarity index 100% rename from components/resources/components-resources/src/skikoMain/kotlin/org/jetbrains/compose/resources/ImageResources.skiko.kt rename to components/resources/library/src/skikoMain/kotlin/org/jetbrains/compose/resources/ImageResources.skiko.kt diff --git a/components/settings.gradle.kts b/components/settings.gradle.kts index 6c07f3c04b..2e5b391e1d 100644 --- a/components/settings.gradle.kts +++ b/components/settings.gradle.kts @@ -28,14 +28,14 @@ dependencyResolutionManagement { } } -include(":SplitPane:components-splitpane") -include(":SplitPane:components-splitpane-demo") -include(":AnimatedImage:components-animatedimage") -include(":AnimatedImage:components-animatedimage-demo") -include(":resources:components-resources") -include(":resources:components-resources-demo:androidApp") -include(":resources:components-resources-demo:desktopApp") -include(":resources:components-resources-demo:shared") -include(":ui-tooling-preview:components-ui-tooling-preview") -include(":ui-tooling-preview:components-ui-tooling-preview-demo:desktopApp") -include(":ui-tooling-preview:components-ui-tooling-preview-demo:shared") +include(":SplitPane:library") +include(":SplitPane:demo") +include(":AnimatedImage:library") +include(":AnimatedImage:demo") +include(":resources:library") +include(":resources:demo:androidApp") +include(":resources:demo:desktopApp") +include(":resources:demo:shared") +include(":ui-tooling-preview:library") +include(":ui-tooling-preview:demo:desktopApp") +include(":ui-tooling-preview:demo:shared") diff --git a/components/ui-tooling-preview/components-ui-tooling-preview-demo/desktopApp/build.gradle.kts b/components/ui-tooling-preview/demo/desktopApp/build.gradle.kts similarity index 76% rename from components/ui-tooling-preview/components-ui-tooling-preview-demo/desktopApp/build.gradle.kts rename to components/ui-tooling-preview/demo/desktopApp/build.gradle.kts index b552f7798e..b810e75f0f 100644 --- a/components/ui-tooling-preview/components-ui-tooling-preview-demo/desktopApp/build.gradle.kts +++ b/components/ui-tooling-preview/demo/desktopApp/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { val jvmMain by getting { dependencies { implementation(compose.desktop.currentOs) - implementation(project(":ui-tooling-preview:components-ui-tooling-preview-demo:shared")) + implementation(project(":ui-tooling-preview:demo:shared")) } } } diff --git a/components/ui-tooling-preview/components-ui-tooling-preview-demo/desktopApp/src/jvmMain/kotlin/Main.kt b/components/ui-tooling-preview/demo/desktopApp/src/jvmMain/kotlin/Main.kt similarity index 100% rename from components/ui-tooling-preview/components-ui-tooling-preview-demo/desktopApp/src/jvmMain/kotlin/Main.kt rename to components/ui-tooling-preview/demo/desktopApp/src/jvmMain/kotlin/Main.kt diff --git a/components/ui-tooling-preview/components-ui-tooling-preview-demo/shared/build.gradle.kts b/components/ui-tooling-preview/demo/shared/build.gradle.kts similarity index 95% rename from components/ui-tooling-preview/components-ui-tooling-preview-demo/shared/build.gradle.kts rename to components/ui-tooling-preview/demo/shared/build.gradle.kts index f9c0a9265a..f5846f7907 100644 --- a/components/ui-tooling-preview/components-ui-tooling-preview-demo/shared/build.gradle.kts +++ b/components/ui-tooling-preview/demo/shared/build.gradle.kts @@ -52,7 +52,7 @@ kotlin { dependencies { implementation(compose.runtime) implementation(compose.material3) - implementation(project(":ui-tooling-preview:components-ui-tooling-preview")) + implementation(project(":ui-tooling-preview:library")) } } val desktopMain by getting { diff --git a/components/ui-tooling-preview/components-ui-tooling-preview-demo/shared/src/commonMain/kotlin/org/jetbrains/compose/preview/demo/shared/UsePreviewAnnotation.kt b/components/ui-tooling-preview/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/preview/demo/shared/UsePreviewAnnotation.kt similarity index 100% rename from components/ui-tooling-preview/components-ui-tooling-preview-demo/shared/src/commonMain/kotlin/org/jetbrains/compose/preview/demo/shared/UsePreviewAnnotation.kt rename to components/ui-tooling-preview/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/preview/demo/shared/UsePreviewAnnotation.kt diff --git a/components/ui-tooling-preview/components-ui-tooling-preview-demo/shared/src/desktopMain/kotlin/org/jetbrains/compose/preview/demo/shared/main.desktop.kt b/components/ui-tooling-preview/demo/shared/src/desktopMain/kotlin/org/jetbrains/compose/preview/demo/shared/main.desktop.kt similarity index 100% rename from components/ui-tooling-preview/components-ui-tooling-preview-demo/shared/src/desktopMain/kotlin/org/jetbrains/compose/preview/demo/shared/main.desktop.kt rename to components/ui-tooling-preview/demo/shared/src/desktopMain/kotlin/org/jetbrains/compose/preview/demo/shared/main.desktop.kt diff --git a/components/ui-tooling-preview/components-ui-tooling-preview/build.gradle.kts b/components/ui-tooling-preview/library/build.gradle.kts similarity index 100% rename from components/ui-tooling-preview/components-ui-tooling-preview/build.gradle.kts rename to components/ui-tooling-preview/library/build.gradle.kts diff --git a/components/ui-tooling-preview/components-ui-tooling-preview/src/commonMain/kotlin/org/jetbrains/compose/ui/tooling/preview/Preview.kt b/components/ui-tooling-preview/library/src/commonMain/kotlin/org/jetbrains/compose/ui/tooling/preview/Preview.kt similarity index 100% rename from components/ui-tooling-preview/components-ui-tooling-preview/src/commonMain/kotlin/org/jetbrains/compose/ui/tooling/preview/Preview.kt rename to components/ui-tooling-preview/library/src/commonMain/kotlin/org/jetbrains/compose/ui/tooling/preview/Preview.kt diff --git a/components/ui-tooling-preview/components-ui-tooling-preview/src/commonMain/kotlin/org/jetbrains/compose/ui/tooling/preview/PreviewParameter.kt b/components/ui-tooling-preview/library/src/commonMain/kotlin/org/jetbrains/compose/ui/tooling/preview/PreviewParameter.kt similarity index 100% rename from components/ui-tooling-preview/components-ui-tooling-preview/src/commonMain/kotlin/org/jetbrains/compose/ui/tooling/preview/PreviewParameter.kt rename to components/ui-tooling-preview/library/src/commonMain/kotlin/org/jetbrains/compose/ui/tooling/preview/PreviewParameter.kt