From 242ec6bbf9b9df085e9d6e56e63e14ff82e4a52d Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Tue, 3 Aug 2021 23:04:15 +0300 Subject: [PATCH] Cleanup samples and adjust for rc5 --- README.md | 8 +++---- compose/frameworks/support | 2 +- compose/prebuilts/androidx/internal | 2 +- .../build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../gradlew | 0 .../gradlew.bat | 0 .../settings.gradle.kts | 0 .../commonMain/kotlin/fallingBalls/Game.kt | 0 .../commonMain/kotlin/fallingBalls/Piece.kt | 0 .../kotlin/fallingBalls/PieceData.kt | 0 .../kotlin/fallingBalls/fallingBalls.kt | 0 .../commonMain/kotlin/modifiers/position.kt | 0 .../androidx/compose/web/with-web/App.kt | 0 .../src/jsMain/kotlin/modifiers/position.kt | 0 .../src/jsMain/resources/index.html | 0 .../src/jsMain/resources/styles.css | 0 .../src/jvmMain/kotlin/App.kt | 0 .../src/jvmMain/kotlin/modifiers/position.kt | 0 .../.gitignore | 0 .../build.gradle.kts | 2 +- .../gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../gradlew | 0 .../gradlew.bat | 0 .../settings.gradle.kts | 0 .../src/main/kotlin/Game.kt | 0 .../src/main/kotlin/Piece.kt | 0 .../src/main/kotlin/main.kt | 0 examples/imageviewer/build.gradle.kts | 4 ++-- .../.gitignore | 0 .../README.md | 0 .../build.gradle.kts | 2 +- .../gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradlew | 0 .../gradlew.bat | 0 .../screenshots/screenshot.png | Bin .../screenshots/toolsshow.png | Bin .../settings.gradle.kts | 0 .../jetbrains/compose/ComposeDemoAction.kt | 0 .../com/jetbrains/compose/theme/Color.kt | 0 .../com/jetbrains/compose/theme/Shape.kt | 0 .../com/jetbrains/compose/theme/Theme.kt | 0 .../com/jetbrains/compose/theme/Type.kt | 0 .../compose/theme/intellij/SwingColor.kt | 0 .../theme/intellij/ThemeChangeListener.kt | 0 .../com/jetbrains/compose/widgets/Buttons.kt | 0 .../compose/widgets/LazyScrollable.kt | 0 .../com/jetbrains/compose/widgets/Loaders.kt | 0 .../jetbrains/compose/widgets/TextInputs.kt | 0 .../com/jetbrains/compose/widgets/Toggles.kt | 0 .../src/main/resources/META-INF/plugin.xml | 0 examples/issues/build.gradle.kts | 4 ++-- examples/notepad/build.gradle.kts | 2 +- .../buildSrc/buildSrc/src/main/kotlin/Deps.kt | 2 +- examples/web-compose-bird/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/web-getting-started/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../{web_landing => web-landing}/.gitignore | 0 .../build.gradle.kts | 2 +- .../gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 examples/{web_landing => web-landing}/gradlew | 0 .../{web_landing => web-landing}/gradlew.bat | 0 .../license/LICENSE.txt | 0 .../license/third_party/README.md | 0 .../license/third_party/highlightjs.txt | 0 .../settings.gradle.kts | 0 .../jsMain/kotlin/com/sample/HighlightJs.kt | 0 .../src/jsMain/kotlin/com/sample/Main.kt | 0 .../kotlin/com/sample/components/Card.kt | 0 .../kotlin/com/sample/components/Layout.kt | 0 .../content/AboutComposeWebLibsSection.kt | 0 .../com/sample/content/CodeSamplesSwitcher.kt | 0 .../kotlin/com/sample/content/CodeSnippets.kt | 0 .../kotlin/com/sample/content/Footer.kt | 0 .../com/sample/content/GetStartedSection.kt | 0 .../kotlin/com/sample/content/Header.kt | 0 .../kotlin/com/sample/content/IntroSection.kt | 0 .../kotlin/com/sample/content/JoinUs.kt | 0 .../kotlin/com/sample/style/Stylesheet.kt | 0 .../jsMain/kotlin/com/sample/style/WtCard.kt | 0 .../jsMain/kotlin/com/sample/style/WtCol.kt | 0 .../kotlin/com/sample/style/WtContainer.kt | 0 .../kotlin/com/sample/style/WtDisplay.kt | 0 .../kotlin/com/sample/style/WtOffest.kt | 0 .../jsMain/kotlin/com/sample/style/WtRow.kt | 0 .../kotlin/com/sample/style/WtSection.kt | 0 .../jsMain/kotlin/com/sample/style/WtText.kt | 0 .../src/jsMain/resources/favicon-32x32.png | Bin .../src/jsMain/resources/hljs.css | 0 .../src/jsMain/resources/i1.svg | 0 .../src/jsMain/resources/ic_fb.svg | 0 .../src/jsMain/resources/ic_feed.svg | 0 .../src/jsMain/resources/ic_info.svg | 0 .../src/jsMain/resources/ic_insta.svg | 0 .../src/jsMain/resources/ic_jb_blog.svg | 0 .../src/jsMain/resources/ic_lang.svg | 0 .../src/jsMain/resources/ic_linkedin.svg | 0 .../src/jsMain/resources/ic_twitter.svg | 0 .../src/jsMain/resources/ic_youtube.svg | 0 .../src/jsMain/resources/index.html | 0 .../src/jsMain/resources/logos.css | 0 examples/web-with-react/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../.gitignore | 0 .../README.md | 0 .../android/build.gradle.kts | 0 .../android/src/main/AndroidManifest.xml | 0 .../compose/demo/widgets/MainActivity.kt | 0 .../drawable-v24/ic_launcher_background.xml | 0 .../drawable-v24/ic_launcher_foreground.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../src/main/res/values-night/themes.xml | 0 .../android/src/main/res/values/colors.xml | 0 .../android/src/main/res/values/strings.xml | 0 .../android/src/main/res/values/themes.xml | 0 .../build.gradle.kts | 2 +- .../common/build.gradle.kts | 0 .../src/androidMain/AndroidManifest.xml | 0 .../compose/demo/widgets/platform/Mouse.kt | 0 .../demo/widgets/platform/Resources.kt | 0 .../demo/widgets/platform/Scrollbar.kt | 0 .../compose/demo/widgets/platform/System.kt | 0 .../demo/widgets/data/DemoDataProvider.kt | 0 .../compose/demo/widgets/data/model/Item.kt | 0 .../compose/demo/widgets/data/model/Tweet.kt | 0 .../compose/demo/widgets/platform/Mouse.kt | 0 .../compose/demo/widgets/platform/Res.kt | 0 .../demo/widgets/platform/Resources.kt | 0 .../demo/widgets/platform/Scrollbar.kt | 0 .../compose/demo/widgets/platform/System.kt | 0 .../compose/demo/widgets/theme/Color.kt | 0 .../compose/demo/widgets/theme/Shape.kt | 0 .../compose/demo/widgets/theme/Theme.kt | 0 .../compose/demo/widgets/theme/Type.kt | 0 .../compose/demo/widgets/ui/MainView.kt | 0 .../compose/demo/widgets/ui/WidgetView.kt | 0 .../compose/demo/widgets/ui/WidgetsType.kt | 0 .../demo/widgets/ui/screens/AppBars.kt | 0 .../demo/widgets/ui/screens/Buttons.kt | 0 .../compose/demo/widgets/ui/screens/Chips.kt | 0 .../demo/widgets/ui/screens/Loaders.kt | 0 .../demo/widgets/ui/screens/SnackBars.kt | 0 .../demo/widgets/ui/screens/TextInputs.kt | 0 .../compose/demo/widgets/ui/screens/Texts.kt | 0 .../demo/widgets/ui/screens/Toggles.kt | 0 .../demo/widgets/ui/screens/UICards.kt | 0 .../demo/widgets/ui/utils/LayoutModifiers.kt | 0 .../demo/widgets/ui/utils/ResizablePanel.kt | 0 .../compose/demo/widgets/ui/utils/Text.kt | 0 .../widgets/ui/utils/VerticalSplittable.kt | 0 .../resources/drawable-nodpi/food6.jpg | Bin .../resources/drawable-nodpi/p1.jpeg | Bin .../resources/drawable-nodpi/p2.jpeg | Bin .../resources/drawable-nodpi/p3.jpeg | Bin .../resources/drawable-nodpi/p6.jpeg | Bin .../resources/drawable/ic_instagram.xml | 0 .../commonMain/resources/drawable/ic_send.xml | 0 .../resources/drawable/ic_twitter.xml | 0 .../compose/demo/widgets/platform/Mouse.kt | 4 ++-- .../demo/widgets/platform/Resources.kt | 0 .../demo/widgets/platform/Scrollbar.kt | 0 .../compose/demo/widgets/platform/System.kt | 0 .../desktop/build.gradle.kts | 0 .../jetbrains/compose/demo/widgets/main.kt | 0 .../gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradlew | 0 .../gradlew.bat | 0 .../settings.gradle.kts | 0 .../third_party/ComposeCookBook_LICENSE.txt | 0 templates/desktop-template/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../multiplatform-template/build.gradle.kts | 2 +- .../common/build.gradle.kts | 11 ++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- templates/web-template/build.gradle.kts | 2 +- .../web-template/src/main/kotlin/main.kt | 21 ++++++++++++++++-- 197 files changed, 53 insertions(+), 43 deletions(-) rename examples/{falling_balls_with_web => falling-balls-web}/build.gradle.kts (97%) rename examples/{falling_balls => falling-balls-web}/gradle/wrapper/gradle-wrapper.jar (100%) rename examples/{widgetsgallery => falling-balls-web}/gradle/wrapper/gradle-wrapper.properties (100%) rename examples/{falling_balls => falling-balls-web}/gradlew (100%) rename examples/{falling_balls_with_web => falling-balls-web}/gradlew.bat (100%) rename examples/{falling_balls_with_web => falling-balls-web}/settings.gradle.kts (100%) rename examples/{falling_balls_with_web => falling-balls-web}/src/commonMain/kotlin/fallingBalls/Game.kt (100%) rename examples/{falling_balls_with_web => falling-balls-web}/src/commonMain/kotlin/fallingBalls/Piece.kt (100%) rename examples/{falling_balls_with_web => falling-balls-web}/src/commonMain/kotlin/fallingBalls/PieceData.kt (100%) rename examples/{falling_balls_with_web => falling-balls-web}/src/commonMain/kotlin/fallingBalls/fallingBalls.kt (100%) rename examples/{falling_balls_with_web => falling-balls-web}/src/commonMain/kotlin/modifiers/position.kt (100%) rename examples/{falling_balls_with_web => falling-balls-web}/src/jsMain/kotlin/androidx/compose/web/with-web/App.kt (100%) rename examples/{falling_balls_with_web => falling-balls-web}/src/jsMain/kotlin/modifiers/position.kt (100%) rename examples/{falling_balls_with_web => falling-balls-web}/src/jsMain/resources/index.html (100%) rename examples/{falling_balls_with_web => falling-balls-web}/src/jsMain/resources/styles.css (100%) rename examples/{falling_balls_with_web => falling-balls-web}/src/jvmMain/kotlin/App.kt (100%) rename examples/{falling_balls_with_web => falling-balls-web}/src/jvmMain/kotlin/modifiers/position.kt (100%) rename examples/{falling_balls => falling-balls}/.gitignore (100%) rename examples/{falling_balls => falling-balls}/build.gradle.kts (94%) rename examples/{falling_balls => falling-balls}/gradle.properties (100%) rename examples/{falling_balls_with_web => falling-balls}/gradle/wrapper/gradle-wrapper.jar (100%) rename examples/{falling_balls => falling-balls}/gradle/wrapper/gradle-wrapper.properties (100%) rename examples/{falling_balls_with_web => falling-balls}/gradlew (100%) rename examples/{falling_balls => falling-balls}/gradlew.bat (100%) rename examples/{falling_balls => falling-balls}/settings.gradle.kts (100%) rename examples/{falling_balls => falling-balls}/src/main/kotlin/Game.kt (100%) rename examples/{falling_balls => falling-balls}/src/main/kotlin/Piece.kt (100%) rename examples/{falling_balls => falling-balls}/src/main/kotlin/main.kt (100%) rename examples/{intelliJPlugin => intellij-plugin}/.gitignore (100%) rename examples/{intelliJPlugin => intellij-plugin}/README.md (100%) rename examples/{intelliJPlugin => intellij-plugin}/build.gradle.kts (92%) rename examples/{intelliJPlugin => intellij-plugin}/gradle.properties (100%) rename examples/{intelliJPlugin => intellij-plugin}/gradle/wrapper/gradle-wrapper.jar (100%) rename examples/{intelliJPlugin => intellij-plugin}/gradle/wrapper/gradle-wrapper.properties (92%) rename examples/{intelliJPlugin => intellij-plugin}/gradlew (100%) rename examples/{intelliJPlugin => intellij-plugin}/gradlew.bat (100%) rename examples/{intelliJPlugin => intellij-plugin}/screenshots/screenshot.png (100%) rename examples/{intelliJPlugin => intellij-plugin}/screenshots/toolsshow.png (100%) rename examples/{intelliJPlugin => intellij-plugin}/settings.gradle.kts (100%) rename examples/{intelliJPlugin => intellij-plugin}/src/main/kotlin/com/jetbrains/compose/ComposeDemoAction.kt (100%) rename examples/{intelliJPlugin => intellij-plugin}/src/main/kotlin/com/jetbrains/compose/theme/Color.kt (100%) rename examples/{intelliJPlugin => intellij-plugin}/src/main/kotlin/com/jetbrains/compose/theme/Shape.kt (100%) rename examples/{intelliJPlugin => intellij-plugin}/src/main/kotlin/com/jetbrains/compose/theme/Theme.kt (100%) rename examples/{intelliJPlugin => intellij-plugin}/src/main/kotlin/com/jetbrains/compose/theme/Type.kt (100%) rename examples/{intelliJPlugin => intellij-plugin}/src/main/kotlin/com/jetbrains/compose/theme/intellij/SwingColor.kt (100%) rename examples/{intelliJPlugin => intellij-plugin}/src/main/kotlin/com/jetbrains/compose/theme/intellij/ThemeChangeListener.kt (100%) rename examples/{intelliJPlugin => intellij-plugin}/src/main/kotlin/com/jetbrains/compose/widgets/Buttons.kt (100%) rename examples/{intelliJPlugin => intellij-plugin}/src/main/kotlin/com/jetbrains/compose/widgets/LazyScrollable.kt (100%) rename examples/{intelliJPlugin => intellij-plugin}/src/main/kotlin/com/jetbrains/compose/widgets/Loaders.kt (100%) rename examples/{intelliJPlugin => intellij-plugin}/src/main/kotlin/com/jetbrains/compose/widgets/TextInputs.kt (100%) rename examples/{intelliJPlugin => intellij-plugin}/src/main/kotlin/com/jetbrains/compose/widgets/Toggles.kt (100%) rename examples/{intelliJPlugin => intellij-plugin}/src/main/resources/META-INF/plugin.xml (100%) rename examples/{web_landing => web-landing}/.gitignore (100%) rename examples/{web_landing => web-landing}/build.gradle.kts (89%) rename examples/{web_landing => web-landing}/gradle.properties (100%) rename examples/{web_landing => web-landing}/gradle/wrapper/gradle-wrapper.jar (100%) rename examples/{falling_balls_with_web => web-landing}/gradle/wrapper/gradle-wrapper.properties (100%) rename examples/{web_landing => web-landing}/gradlew (100%) rename examples/{web_landing => web-landing}/gradlew.bat (100%) rename examples/{web_landing => web-landing}/license/LICENSE.txt (100%) rename examples/{web_landing => web-landing}/license/third_party/README.md (100%) rename examples/{web_landing => web-landing}/license/third_party/highlightjs.txt (100%) rename examples/{web_landing => web-landing}/settings.gradle.kts (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/HighlightJs.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/Main.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/components/Card.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/components/Layout.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/content/Footer.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/content/GetStartedSection.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/content/Header.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/content/IntroSection.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/content/JoinUs.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/style/Stylesheet.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/style/WtCard.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/style/WtCol.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/style/WtContainer.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/style/WtDisplay.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/style/WtOffest.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/style/WtRow.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/style/WtSection.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/kotlin/com/sample/style/WtText.kt (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/favicon-32x32.png (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/hljs.css (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/i1.svg (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/ic_fb.svg (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/ic_feed.svg (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/ic_info.svg (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/ic_insta.svg (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/ic_jb_blog.svg (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/ic_lang.svg (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/ic_linkedin.svg (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/ic_twitter.svg (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/ic_youtube.svg (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/index.html (100%) rename examples/{web_landing => web-landing}/src/jsMain/resources/logos.css (100%) rename examples/{widgetsgallery => widgets-gallery}/.gitignore (100%) rename examples/{widgetsgallery => widgets-gallery}/README.md (100%) rename examples/{widgetsgallery => widgets-gallery}/android/build.gradle.kts (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/AndroidManifest.xml (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/java/org/jetbrains/compose/demo/widgets/MainActivity.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/drawable-v24/ic_launcher_background.xml (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/values-night/themes.xml (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/values/colors.xml (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/values/strings.xml (100%) rename examples/{widgetsgallery => widgets-gallery}/android/src/main/res/values/themes.xml (100%) rename examples/{widgetsgallery => widgets-gallery}/build.gradle.kts (97%) rename examples/{widgetsgallery => widgets-gallery}/common/build.gradle.kts (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/androidMain/AndroidManifest.xml (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/DemoDataProvider.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/model/Item.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/model/Tweet.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Res.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Color.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Shape.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Theme.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Type.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/MainView.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetView.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetsType.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/AppBars.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Buttons.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Chips.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Loaders.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/SnackBars.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/TextInputs.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Texts.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Toggles.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/UICards.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/LayoutModifiers.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/ResizablePanel.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/Text.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/VerticalSplittable.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/resources/drawable-nodpi/food6.jpg (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/resources/drawable-nodpi/p1.jpeg (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/resources/drawable-nodpi/p2.jpeg (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/resources/drawable-nodpi/p3.jpeg (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/resources/drawable-nodpi/p6.jpeg (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/resources/drawable/ic_instagram.xml (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/resources/drawable/ic_send.xml (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/commonMain/resources/drawable/ic_twitter.xml (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt (84%) rename examples/{widgetsgallery => widgets-gallery}/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/desktop/build.gradle.kts (100%) rename examples/{widgetsgallery => widgets-gallery}/desktop/src/jvmMain/kotlin/org/jetbrains/compose/demo/widgets/main.kt (100%) rename examples/{widgetsgallery => widgets-gallery}/gradle.properties (100%) rename examples/{widgetsgallery => widgets-gallery}/gradle/wrapper/gradle-wrapper.jar (100%) rename examples/{web_landing => widgets-gallery}/gradle/wrapper/gradle-wrapper.properties (92%) rename examples/{widgetsgallery => widgets-gallery}/gradlew (100%) rename examples/{widgetsgallery => widgets-gallery}/gradlew.bat (100%) rename examples/{widgetsgallery => widgets-gallery}/settings.gradle.kts (100%) rename examples/{widgetsgallery => widgets-gallery}/third_party/ComposeCookBook_LICENSE.txt (100%) diff --git a/README.md b/README.md index 943a16f070..26965fa0a0 100644 --- a/README.md +++ b/README.md @@ -20,13 +20,13 @@ Preview functionality (check your application UI without building/running it) fo * [codeviewer](examples/codeviewer) - File Browser and Code Viewer application for Android and Desktop * [imageviewer](examples/imageviewer) - Image Viewer application for Android and Desktop * [issues](examples/issues) - GitHub issue tracker with an adaptive UI and ktor-client - * [game](examples/falling_balls) - Simple game - * [game](examples/falling_balls_with_web) - Simple game for web target + * [game](examples/falling-balls) - Simple game + * [game](examples/falling-balls-with-web) - Simple game for web target * [compose-bird](examples/web-compose-bird) - A flappy bird clone using Compose for Web * [notepad](examples/notepad) - Notepad, using the new experimental Composable Window API * [todoapp](examples/todoapp) - TODO items tracker with persistence and multiple screens - * [widgetsgallery](examples/widgetsgallery) - Gallery of standard widgets - * [IDEA plugin](examples/intelliJPlugin) - Plugin for IDEA using Compose for Desktop + * [widgets gallery](examples/widgetsgallery) - Gallery of standard widgets + * [IDEA plugin](examples/intellij-plugin) - Plugin for IDEA using Compose for Desktop * [gradle-plugins](gradle-plugins) - a plugin, simplifying usage of Compose Multiplatform with Gradle * [templates](templates) - new application templates (see `desktop-template/build_and_run_from_cli_example.sh` for using without Gradle) * [tutorials](tutorials) - tutorials on using Compose Multiplatform diff --git a/compose/frameworks/support b/compose/frameworks/support index 7ab919df67..9b5ede8dc4 160000 --- a/compose/frameworks/support +++ b/compose/frameworks/support @@ -1 +1 @@ -Subproject commit 7ab919df67516862cc75a9f1880e85920fc93cb6 +Subproject commit 9b5ede8dc435293ac09419421528921b8fed27fb diff --git a/compose/prebuilts/androidx/internal b/compose/prebuilts/androidx/internal index 818a882ba7..f37dc6b42f 160000 --- a/compose/prebuilts/androidx/internal +++ b/compose/prebuilts/androidx/internal @@ -1 +1 @@ -Subproject commit 818a882ba70e8603d6a22b17d421c9049926da4c +Subproject commit f37dc6b42fe7838e9e37fbe8a9eb063a1550acd8 diff --git a/examples/falling_balls_with_web/build.gradle.kts b/examples/falling-balls-web/build.gradle.kts similarity index 97% rename from examples/falling_balls_with_web/build.gradle.kts rename to examples/falling-balls-web/build.gradle.kts index 17de43703e..9f8930a071 100644 --- a/examples/falling_balls_with_web/build.gradle.kts +++ b/examples/falling-balls-web/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat plugins { kotlin("multiplatform") version "1.5.21" - id("org.jetbrains.compose") version "1.0.0-alpha1-rc1" + id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" } version = "1.0-SNAPSHOT" diff --git a/examples/falling_balls/gradle/wrapper/gradle-wrapper.jar b/examples/falling-balls-web/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from examples/falling_balls/gradle/wrapper/gradle-wrapper.jar rename to examples/falling-balls-web/gradle/wrapper/gradle-wrapper.jar diff --git a/examples/widgetsgallery/gradle/wrapper/gradle-wrapper.properties b/examples/falling-balls-web/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from examples/widgetsgallery/gradle/wrapper/gradle-wrapper.properties rename to examples/falling-balls-web/gradle/wrapper/gradle-wrapper.properties diff --git a/examples/falling_balls/gradlew b/examples/falling-balls-web/gradlew similarity index 100% rename from examples/falling_balls/gradlew rename to examples/falling-balls-web/gradlew diff --git a/examples/falling_balls_with_web/gradlew.bat b/examples/falling-balls-web/gradlew.bat similarity index 100% rename from examples/falling_balls_with_web/gradlew.bat rename to examples/falling-balls-web/gradlew.bat diff --git a/examples/falling_balls_with_web/settings.gradle.kts b/examples/falling-balls-web/settings.gradle.kts similarity index 100% rename from examples/falling_balls_with_web/settings.gradle.kts rename to examples/falling-balls-web/settings.gradle.kts diff --git a/examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/Game.kt b/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/Game.kt similarity index 100% rename from examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/Game.kt rename to examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/Game.kt diff --git a/examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/Piece.kt b/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/Piece.kt similarity index 100% rename from examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/Piece.kt rename to examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/Piece.kt diff --git a/examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/PieceData.kt b/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/PieceData.kt similarity index 100% rename from examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/PieceData.kt rename to examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/PieceData.kt diff --git a/examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/fallingBalls.kt b/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/fallingBalls.kt similarity index 100% rename from examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/fallingBalls.kt rename to examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/fallingBalls.kt diff --git a/examples/falling_balls_with_web/src/commonMain/kotlin/modifiers/position.kt b/examples/falling-balls-web/src/commonMain/kotlin/modifiers/position.kt similarity index 100% rename from examples/falling_balls_with_web/src/commonMain/kotlin/modifiers/position.kt rename to examples/falling-balls-web/src/commonMain/kotlin/modifiers/position.kt diff --git a/examples/falling_balls_with_web/src/jsMain/kotlin/androidx/compose/web/with-web/App.kt b/examples/falling-balls-web/src/jsMain/kotlin/androidx/compose/web/with-web/App.kt similarity index 100% rename from examples/falling_balls_with_web/src/jsMain/kotlin/androidx/compose/web/with-web/App.kt rename to examples/falling-balls-web/src/jsMain/kotlin/androidx/compose/web/with-web/App.kt diff --git a/examples/falling_balls_with_web/src/jsMain/kotlin/modifiers/position.kt b/examples/falling-balls-web/src/jsMain/kotlin/modifiers/position.kt similarity index 100% rename from examples/falling_balls_with_web/src/jsMain/kotlin/modifiers/position.kt rename to examples/falling-balls-web/src/jsMain/kotlin/modifiers/position.kt diff --git a/examples/falling_balls_with_web/src/jsMain/resources/index.html b/examples/falling-balls-web/src/jsMain/resources/index.html similarity index 100% rename from examples/falling_balls_with_web/src/jsMain/resources/index.html rename to examples/falling-balls-web/src/jsMain/resources/index.html diff --git a/examples/falling_balls_with_web/src/jsMain/resources/styles.css b/examples/falling-balls-web/src/jsMain/resources/styles.css similarity index 100% rename from examples/falling_balls_with_web/src/jsMain/resources/styles.css rename to examples/falling-balls-web/src/jsMain/resources/styles.css diff --git a/examples/falling_balls_with_web/src/jvmMain/kotlin/App.kt b/examples/falling-balls-web/src/jvmMain/kotlin/App.kt similarity index 100% rename from examples/falling_balls_with_web/src/jvmMain/kotlin/App.kt rename to examples/falling-balls-web/src/jvmMain/kotlin/App.kt diff --git a/examples/falling_balls_with_web/src/jvmMain/kotlin/modifiers/position.kt b/examples/falling-balls-web/src/jvmMain/kotlin/modifiers/position.kt similarity index 100% rename from examples/falling_balls_with_web/src/jvmMain/kotlin/modifiers/position.kt rename to examples/falling-balls-web/src/jvmMain/kotlin/modifiers/position.kt diff --git a/examples/falling_balls/.gitignore b/examples/falling-balls/.gitignore similarity index 100% rename from examples/falling_balls/.gitignore rename to examples/falling-balls/.gitignore diff --git a/examples/falling_balls/build.gradle.kts b/examples/falling-balls/build.gradle.kts similarity index 94% rename from examples/falling_balls/build.gradle.kts rename to examples/falling-balls/build.gradle.kts index b046998fee..3be79bd592 100644 --- a/examples/falling_balls/build.gradle.kts +++ b/examples/falling-balls/build.gradle.kts @@ -6,7 +6,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.5.21" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "1.0.0-alpha1-rc1" + id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" } group = "me.user" diff --git a/examples/falling_balls/gradle.properties b/examples/falling-balls/gradle.properties similarity index 100% rename from examples/falling_balls/gradle.properties rename to examples/falling-balls/gradle.properties diff --git a/examples/falling_balls_with_web/gradle/wrapper/gradle-wrapper.jar b/examples/falling-balls/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from examples/falling_balls_with_web/gradle/wrapper/gradle-wrapper.jar rename to examples/falling-balls/gradle/wrapper/gradle-wrapper.jar diff --git a/examples/falling_balls/gradle/wrapper/gradle-wrapper.properties b/examples/falling-balls/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from examples/falling_balls/gradle/wrapper/gradle-wrapper.properties rename to examples/falling-balls/gradle/wrapper/gradle-wrapper.properties diff --git a/examples/falling_balls_with_web/gradlew b/examples/falling-balls/gradlew similarity index 100% rename from examples/falling_balls_with_web/gradlew rename to examples/falling-balls/gradlew diff --git a/examples/falling_balls/gradlew.bat b/examples/falling-balls/gradlew.bat similarity index 100% rename from examples/falling_balls/gradlew.bat rename to examples/falling-balls/gradlew.bat diff --git a/examples/falling_balls/settings.gradle.kts b/examples/falling-balls/settings.gradle.kts similarity index 100% rename from examples/falling_balls/settings.gradle.kts rename to examples/falling-balls/settings.gradle.kts diff --git a/examples/falling_balls/src/main/kotlin/Game.kt b/examples/falling-balls/src/main/kotlin/Game.kt similarity index 100% rename from examples/falling_balls/src/main/kotlin/Game.kt rename to examples/falling-balls/src/main/kotlin/Game.kt diff --git a/examples/falling_balls/src/main/kotlin/Piece.kt b/examples/falling-balls/src/main/kotlin/Piece.kt similarity index 100% rename from examples/falling_balls/src/main/kotlin/Piece.kt rename to examples/falling-balls/src/main/kotlin/Piece.kt diff --git a/examples/falling_balls/src/main/kotlin/main.kt b/examples/falling-balls/src/main/kotlin/main.kt similarity index 100% rename from examples/falling_balls/src/main/kotlin/main.kt rename to examples/falling-balls/src/main/kotlin/main.kt diff --git a/examples/imageviewer/build.gradle.kts b/examples/imageviewer/build.gradle.kts index cb9474535d..c2caa9d99a 100755 --- a/examples/imageviewer/build.gradle.kts +++ b/examples/imageviewer/build.gradle.kts @@ -7,8 +7,8 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc3") - classpath("com.android.tools.build:gradle:7.0.0") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc5") + classpath("com.android.tools.build:gradle:4.1.0") classpath(kotlin("gradle-plugin", version = "1.5.21")) } } diff --git a/examples/intelliJPlugin/.gitignore b/examples/intellij-plugin/.gitignore similarity index 100% rename from examples/intelliJPlugin/.gitignore rename to examples/intellij-plugin/.gitignore diff --git a/examples/intelliJPlugin/README.md b/examples/intellij-plugin/README.md similarity index 100% rename from examples/intelliJPlugin/README.md rename to examples/intellij-plugin/README.md diff --git a/examples/intelliJPlugin/build.gradle.kts b/examples/intellij-plugin/build.gradle.kts similarity index 92% rename from examples/intelliJPlugin/build.gradle.kts rename to examples/intellij-plugin/build.gradle.kts index 1af7f717a4..dcf8aef387 100644 --- a/examples/intelliJPlugin/build.gradle.kts +++ b/examples/intellij-plugin/build.gradle.kts @@ -5,7 +5,7 @@ plugins { java kotlin("jvm") version "1.5.21" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "1.0.0-alpha1-rc1" + id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" id("idea") } diff --git a/examples/intelliJPlugin/gradle.properties b/examples/intellij-plugin/gradle.properties similarity index 100% rename from examples/intelliJPlugin/gradle.properties rename to examples/intellij-plugin/gradle.properties diff --git a/examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.jar b/examples/intellij-plugin/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.jar rename to examples/intellij-plugin/gradle/wrapper/gradle-wrapper.jar diff --git a/examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.properties b/examples/intellij-plugin/gradle/wrapper/gradle-wrapper.properties similarity index 92% rename from examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.properties rename to examples/intellij-plugin/gradle/wrapper/gradle-wrapper.properties index 3c4101c3ec..05679dc3c1 100644 --- a/examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.properties +++ b/examples/intellij-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/intelliJPlugin/gradlew b/examples/intellij-plugin/gradlew similarity index 100% rename from examples/intelliJPlugin/gradlew rename to examples/intellij-plugin/gradlew diff --git a/examples/intelliJPlugin/gradlew.bat b/examples/intellij-plugin/gradlew.bat similarity index 100% rename from examples/intelliJPlugin/gradlew.bat rename to examples/intellij-plugin/gradlew.bat diff --git a/examples/intelliJPlugin/screenshots/screenshot.png b/examples/intellij-plugin/screenshots/screenshot.png similarity index 100% rename from examples/intelliJPlugin/screenshots/screenshot.png rename to examples/intellij-plugin/screenshots/screenshot.png diff --git a/examples/intelliJPlugin/screenshots/toolsshow.png b/examples/intellij-plugin/screenshots/toolsshow.png similarity index 100% rename from examples/intelliJPlugin/screenshots/toolsshow.png rename to examples/intellij-plugin/screenshots/toolsshow.png diff --git a/examples/intelliJPlugin/settings.gradle.kts b/examples/intellij-plugin/settings.gradle.kts similarity index 100% rename from examples/intelliJPlugin/settings.gradle.kts rename to examples/intellij-plugin/settings.gradle.kts diff --git a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/ComposeDemoAction.kt b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/ComposeDemoAction.kt similarity index 100% rename from examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/ComposeDemoAction.kt rename to examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/ComposeDemoAction.kt diff --git a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/theme/Color.kt b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Color.kt similarity index 100% rename from examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/theme/Color.kt rename to examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Color.kt diff --git a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/theme/Shape.kt b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Shape.kt similarity index 100% rename from examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/theme/Shape.kt rename to examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Shape.kt diff --git a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/theme/Theme.kt b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Theme.kt similarity index 100% rename from examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/theme/Theme.kt rename to examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Theme.kt diff --git a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/theme/Type.kt b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Type.kt similarity index 100% rename from examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/theme/Type.kt rename to examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Type.kt diff --git a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/theme/intellij/SwingColor.kt b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/intellij/SwingColor.kt similarity index 100% rename from examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/theme/intellij/SwingColor.kt rename to examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/intellij/SwingColor.kt diff --git a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/theme/intellij/ThemeChangeListener.kt b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/intellij/ThemeChangeListener.kt similarity index 100% rename from examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/theme/intellij/ThemeChangeListener.kt rename to examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/intellij/ThemeChangeListener.kt diff --git a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/Buttons.kt b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/Buttons.kt similarity index 100% rename from examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/Buttons.kt rename to examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/Buttons.kt diff --git a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/LazyScrollable.kt b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/LazyScrollable.kt similarity index 100% rename from examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/LazyScrollable.kt rename to examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/LazyScrollable.kt diff --git a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/Loaders.kt b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/Loaders.kt similarity index 100% rename from examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/Loaders.kt rename to examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/Loaders.kt diff --git a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/TextInputs.kt b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/TextInputs.kt similarity index 100% rename from examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/TextInputs.kt rename to examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/TextInputs.kt diff --git a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/Toggles.kt b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/Toggles.kt similarity index 100% rename from examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/Toggles.kt rename to examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/Toggles.kt diff --git a/examples/intelliJPlugin/src/main/resources/META-INF/plugin.xml b/examples/intellij-plugin/src/main/resources/META-INF/plugin.xml similarity index 100% rename from examples/intelliJPlugin/src/main/resources/META-INF/plugin.xml rename to examples/intellij-plugin/src/main/resources/META-INF/plugin.xml diff --git a/examples/issues/build.gradle.kts b/examples/issues/build.gradle.kts index f4778da3c7..ba5a9fa91b 100644 --- a/examples/issues/build.gradle.kts +++ b/examples/issues/build.gradle.kts @@ -8,8 +8,8 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc1") - classpath("com.android.tools.build:gradle:7.0.0") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc5") + classpath("com.android.tools.build:gradle:4.1.0") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.5.21")) } diff --git a/examples/notepad/build.gradle.kts b/examples/notepad/build.gradle.kts index 481e402cb0..172b524eb4 100644 --- a/examples/notepad/build.gradle.kts +++ b/examples/notepad/build.gradle.kts @@ -5,7 +5,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.5.21" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version ("1.0.0-alpha1-rc1") + id("org.jetbrains.compose") version ("1.0.0-alpha1-rc5") } repositories { diff --git a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt index 518b126d73..bf88d0dd2f 100644 --- a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt +++ b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt @@ -13,7 +13,7 @@ object Deps { object Compose { // __LATEST_COMPOSE_RELEASE_VERSION__ - private const val VERSION = "1.0.0-alpha1-rc3" + private const val VERSION = "1.0.0-alpha1-rc5" const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION" } } diff --git a/examples/web-compose-bird/build.gradle.kts b/examples/web-compose-bird/build.gradle.kts index dee8793c74..4504f06ec8 100644 --- a/examples/web-compose-bird/build.gradle.kts +++ b/examples/web-compose-bird/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("multiplatform") version "1.5.21" - id("org.jetbrains.compose") version "1.0.0-alpha1-rc1" + id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" } group = "com.theapache64.composebird" version = "1.0.0-alpha01" diff --git a/examples/web-compose-bird/gradle/wrapper/gradle-wrapper.properties b/examples/web-compose-bird/gradle/wrapper/gradle-wrapper.properties index da9702f9e7..05679dc3c1 100644 --- a/examples/web-compose-bird/gradle/wrapper/gradle-wrapper.properties +++ b/examples/web-compose-bird/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/web-getting-started/build.gradle.kts b/examples/web-getting-started/build.gradle.kts index 8ab7f09be9..f0b70f6fdb 100644 --- a/examples/web-getting-started/build.gradle.kts +++ b/examples/web-getting-started/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("multiplatform") version "1.5.21" - id("org.jetbrains.compose") version "1.0.0-alpha1-rc1" + id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" } repositories { diff --git a/examples/web-getting-started/gradle/wrapper/gradle-wrapper.properties b/examples/web-getting-started/gradle/wrapper/gradle-wrapper.properties index 29e4134576..05679dc3c1 100644 --- a/examples/web-getting-started/gradle/wrapper/gradle-wrapper.properties +++ b/examples/web-getting-started/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/web_landing/.gitignore b/examples/web-landing/.gitignore similarity index 100% rename from examples/web_landing/.gitignore rename to examples/web-landing/.gitignore diff --git a/examples/web_landing/build.gradle.kts b/examples/web-landing/build.gradle.kts similarity index 89% rename from examples/web_landing/build.gradle.kts rename to examples/web-landing/build.gradle.kts index d80a771b8e..9b07a147a0 100644 --- a/examples/web_landing/build.gradle.kts +++ b/examples/web-landing/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("multiplatform") version "1.5.21" - id("org.jetbrains.compose") version "1.0.0-alpha1-rc1" + id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" } repositories { diff --git a/examples/web_landing/gradle.properties b/examples/web-landing/gradle.properties similarity index 100% rename from examples/web_landing/gradle.properties rename to examples/web-landing/gradle.properties diff --git a/examples/web_landing/gradle/wrapper/gradle-wrapper.jar b/examples/web-landing/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from examples/web_landing/gradle/wrapper/gradle-wrapper.jar rename to examples/web-landing/gradle/wrapper/gradle-wrapper.jar diff --git a/examples/falling_balls_with_web/gradle/wrapper/gradle-wrapper.properties b/examples/web-landing/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from examples/falling_balls_with_web/gradle/wrapper/gradle-wrapper.properties rename to examples/web-landing/gradle/wrapper/gradle-wrapper.properties diff --git a/examples/web_landing/gradlew b/examples/web-landing/gradlew similarity index 100% rename from examples/web_landing/gradlew rename to examples/web-landing/gradlew diff --git a/examples/web_landing/gradlew.bat b/examples/web-landing/gradlew.bat similarity index 100% rename from examples/web_landing/gradlew.bat rename to examples/web-landing/gradlew.bat diff --git a/examples/web_landing/license/LICENSE.txt b/examples/web-landing/license/LICENSE.txt similarity index 100% rename from examples/web_landing/license/LICENSE.txt rename to examples/web-landing/license/LICENSE.txt diff --git a/examples/web_landing/license/third_party/README.md b/examples/web-landing/license/third_party/README.md similarity index 100% rename from examples/web_landing/license/third_party/README.md rename to examples/web-landing/license/third_party/README.md diff --git a/examples/web_landing/license/third_party/highlightjs.txt b/examples/web-landing/license/third_party/highlightjs.txt similarity index 100% rename from examples/web_landing/license/third_party/highlightjs.txt rename to examples/web-landing/license/third_party/highlightjs.txt diff --git a/examples/web_landing/settings.gradle.kts b/examples/web-landing/settings.gradle.kts similarity index 100% rename from examples/web_landing/settings.gradle.kts rename to examples/web-landing/settings.gradle.kts diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/HighlightJs.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/HighlightJs.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/HighlightJs.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/HighlightJs.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/Main.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/Main.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/Main.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/Main.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/components/Card.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/components/Card.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/components/Card.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/components/Card.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/components/Layout.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/components/Layout.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/components/Layout.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/components/Layout.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/Footer.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/content/Footer.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/content/Footer.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/content/Footer.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/GetStartedSection.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/content/GetStartedSection.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/content/GetStartedSection.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/content/GetStartedSection.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/Header.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/content/Header.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/content/Header.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/content/Header.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/IntroSection.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/content/IntroSection.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/content/IntroSection.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/content/IntroSection.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/JoinUs.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/content/JoinUs.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/content/JoinUs.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/content/JoinUs.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCard.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtCard.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCard.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/style/WtCard.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCol.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtCol.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCol.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/style/WtCol.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtContainer.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtContainer.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/style/WtContainer.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/style/WtContainer.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtDisplay.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtDisplay.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/style/WtDisplay.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/style/WtDisplay.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtOffest.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtOffest.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/style/WtOffest.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/style/WtOffest.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtRow.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtRow.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/style/WtRow.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/style/WtRow.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtSection.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtSection.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/style/WtSection.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/style/WtSection.kt diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtText.kt b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtText.kt similarity index 100% rename from examples/web_landing/src/jsMain/kotlin/com/sample/style/WtText.kt rename to examples/web-landing/src/jsMain/kotlin/com/sample/style/WtText.kt diff --git a/examples/web_landing/src/jsMain/resources/favicon-32x32.png b/examples/web-landing/src/jsMain/resources/favicon-32x32.png similarity index 100% rename from examples/web_landing/src/jsMain/resources/favicon-32x32.png rename to examples/web-landing/src/jsMain/resources/favicon-32x32.png diff --git a/examples/web_landing/src/jsMain/resources/hljs.css b/examples/web-landing/src/jsMain/resources/hljs.css similarity index 100% rename from examples/web_landing/src/jsMain/resources/hljs.css rename to examples/web-landing/src/jsMain/resources/hljs.css diff --git a/examples/web_landing/src/jsMain/resources/i1.svg b/examples/web-landing/src/jsMain/resources/i1.svg similarity index 100% rename from examples/web_landing/src/jsMain/resources/i1.svg rename to examples/web-landing/src/jsMain/resources/i1.svg diff --git a/examples/web_landing/src/jsMain/resources/ic_fb.svg b/examples/web-landing/src/jsMain/resources/ic_fb.svg similarity index 100% rename from examples/web_landing/src/jsMain/resources/ic_fb.svg rename to examples/web-landing/src/jsMain/resources/ic_fb.svg diff --git a/examples/web_landing/src/jsMain/resources/ic_feed.svg b/examples/web-landing/src/jsMain/resources/ic_feed.svg similarity index 100% rename from examples/web_landing/src/jsMain/resources/ic_feed.svg rename to examples/web-landing/src/jsMain/resources/ic_feed.svg diff --git a/examples/web_landing/src/jsMain/resources/ic_info.svg b/examples/web-landing/src/jsMain/resources/ic_info.svg similarity index 100% rename from examples/web_landing/src/jsMain/resources/ic_info.svg rename to examples/web-landing/src/jsMain/resources/ic_info.svg diff --git a/examples/web_landing/src/jsMain/resources/ic_insta.svg b/examples/web-landing/src/jsMain/resources/ic_insta.svg similarity index 100% rename from examples/web_landing/src/jsMain/resources/ic_insta.svg rename to examples/web-landing/src/jsMain/resources/ic_insta.svg diff --git a/examples/web_landing/src/jsMain/resources/ic_jb_blog.svg b/examples/web-landing/src/jsMain/resources/ic_jb_blog.svg similarity index 100% rename from examples/web_landing/src/jsMain/resources/ic_jb_blog.svg rename to examples/web-landing/src/jsMain/resources/ic_jb_blog.svg diff --git a/examples/web_landing/src/jsMain/resources/ic_lang.svg b/examples/web-landing/src/jsMain/resources/ic_lang.svg similarity index 100% rename from examples/web_landing/src/jsMain/resources/ic_lang.svg rename to examples/web-landing/src/jsMain/resources/ic_lang.svg diff --git a/examples/web_landing/src/jsMain/resources/ic_linkedin.svg b/examples/web-landing/src/jsMain/resources/ic_linkedin.svg similarity index 100% rename from examples/web_landing/src/jsMain/resources/ic_linkedin.svg rename to examples/web-landing/src/jsMain/resources/ic_linkedin.svg diff --git a/examples/web_landing/src/jsMain/resources/ic_twitter.svg b/examples/web-landing/src/jsMain/resources/ic_twitter.svg similarity index 100% rename from examples/web_landing/src/jsMain/resources/ic_twitter.svg rename to examples/web-landing/src/jsMain/resources/ic_twitter.svg diff --git a/examples/web_landing/src/jsMain/resources/ic_youtube.svg b/examples/web-landing/src/jsMain/resources/ic_youtube.svg similarity index 100% rename from examples/web_landing/src/jsMain/resources/ic_youtube.svg rename to examples/web-landing/src/jsMain/resources/ic_youtube.svg diff --git a/examples/web_landing/src/jsMain/resources/index.html b/examples/web-landing/src/jsMain/resources/index.html similarity index 100% rename from examples/web_landing/src/jsMain/resources/index.html rename to examples/web-landing/src/jsMain/resources/index.html diff --git a/examples/web_landing/src/jsMain/resources/logos.css b/examples/web-landing/src/jsMain/resources/logos.css similarity index 100% rename from examples/web_landing/src/jsMain/resources/logos.css rename to examples/web-landing/src/jsMain/resources/logos.css diff --git a/examples/web-with-react/build.gradle.kts b/examples/web-with-react/build.gradle.kts index 5a41163665..b628b81ca3 100644 --- a/examples/web-with-react/build.gradle.kts +++ b/examples/web-with-react/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("multiplatform") version "1.5.21" - id("org.jetbrains.compose") version "1.0.0-alpha1-rc1" + id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" } repositories { diff --git a/examples/web-with-react/gradle/wrapper/gradle-wrapper.properties b/examples/web-with-react/gradle/wrapper/gradle-wrapper.properties index 29e4134576..05679dc3c1 100644 --- a/examples/web-with-react/gradle/wrapper/gradle-wrapper.properties +++ b/examples/web-with-react/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/widgetsgallery/.gitignore b/examples/widgets-gallery/.gitignore similarity index 100% rename from examples/widgetsgallery/.gitignore rename to examples/widgets-gallery/.gitignore diff --git a/examples/widgetsgallery/README.md b/examples/widgets-gallery/README.md similarity index 100% rename from examples/widgetsgallery/README.md rename to examples/widgets-gallery/README.md diff --git a/examples/widgetsgallery/android/build.gradle.kts b/examples/widgets-gallery/android/build.gradle.kts similarity index 100% rename from examples/widgetsgallery/android/build.gradle.kts rename to examples/widgets-gallery/android/build.gradle.kts diff --git a/examples/widgetsgallery/android/src/main/AndroidManifest.xml b/examples/widgets-gallery/android/src/main/AndroidManifest.xml similarity index 100% rename from examples/widgetsgallery/android/src/main/AndroidManifest.xml rename to examples/widgets-gallery/android/src/main/AndroidManifest.xml diff --git a/examples/widgetsgallery/android/src/main/java/org/jetbrains/compose/demo/widgets/MainActivity.kt b/examples/widgets-gallery/android/src/main/java/org/jetbrains/compose/demo/widgets/MainActivity.kt similarity index 100% rename from examples/widgetsgallery/android/src/main/java/org/jetbrains/compose/demo/widgets/MainActivity.kt rename to examples/widgets-gallery/android/src/main/java/org/jetbrains/compose/demo/widgets/MainActivity.kt diff --git a/examples/widgetsgallery/android/src/main/res/drawable-v24/ic_launcher_background.xml b/examples/widgets-gallery/android/src/main/res/drawable-v24/ic_launcher_background.xml similarity index 100% rename from examples/widgetsgallery/android/src/main/res/drawable-v24/ic_launcher_background.xml rename to examples/widgets-gallery/android/src/main/res/drawable-v24/ic_launcher_background.xml diff --git a/examples/widgetsgallery/android/src/main/res/drawable-v24/ic_launcher_foreground.xml b/examples/widgets-gallery/android/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from examples/widgetsgallery/android/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to examples/widgets-gallery/android/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/examples/widgetsgallery/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/widgets-gallery/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from examples/widgetsgallery/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to examples/widgets-gallery/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/examples/widgetsgallery/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/widgets-gallery/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from examples/widgetsgallery/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to examples/widgets-gallery/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/examples/widgetsgallery/android/src/main/res/mipmap-hdpi/ic_launcher.png b/examples/widgets-gallery/android/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from examples/widgetsgallery/android/src/main/res/mipmap-hdpi/ic_launcher.png rename to examples/widgets-gallery/android/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/examples/widgetsgallery/android/src/main/res/mipmap-hdpi/ic_launcher_round.png b/examples/widgets-gallery/android/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from examples/widgetsgallery/android/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to examples/widgets-gallery/android/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/examples/widgetsgallery/android/src/main/res/mipmap-mdpi/ic_launcher.png b/examples/widgets-gallery/android/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from examples/widgetsgallery/android/src/main/res/mipmap-mdpi/ic_launcher.png rename to examples/widgets-gallery/android/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/examples/widgetsgallery/android/src/main/res/mipmap-mdpi/ic_launcher_round.png b/examples/widgets-gallery/android/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from examples/widgetsgallery/android/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to examples/widgets-gallery/android/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/examples/widgetsgallery/android/src/main/res/mipmap-xhdpi/ic_launcher.png b/examples/widgets-gallery/android/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from examples/widgetsgallery/android/src/main/res/mipmap-xhdpi/ic_launcher.png rename to examples/widgets-gallery/android/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/examples/widgetsgallery/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/examples/widgets-gallery/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from examples/widgetsgallery/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to examples/widgets-gallery/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/examples/widgetsgallery/android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/examples/widgets-gallery/android/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from examples/widgetsgallery/android/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to examples/widgets-gallery/android/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/examples/widgetsgallery/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/examples/widgets-gallery/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from examples/widgetsgallery/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to examples/widgets-gallery/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/examples/widgetsgallery/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/examples/widgets-gallery/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from examples/widgetsgallery/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to examples/widgets-gallery/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/examples/widgetsgallery/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/examples/widgets-gallery/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from examples/widgetsgallery/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to examples/widgets-gallery/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/examples/widgetsgallery/android/src/main/res/values-night/themes.xml b/examples/widgets-gallery/android/src/main/res/values-night/themes.xml similarity index 100% rename from examples/widgetsgallery/android/src/main/res/values-night/themes.xml rename to examples/widgets-gallery/android/src/main/res/values-night/themes.xml diff --git a/examples/widgetsgallery/android/src/main/res/values/colors.xml b/examples/widgets-gallery/android/src/main/res/values/colors.xml similarity index 100% rename from examples/widgetsgallery/android/src/main/res/values/colors.xml rename to examples/widgets-gallery/android/src/main/res/values/colors.xml diff --git a/examples/widgetsgallery/android/src/main/res/values/strings.xml b/examples/widgets-gallery/android/src/main/res/values/strings.xml similarity index 100% rename from examples/widgetsgallery/android/src/main/res/values/strings.xml rename to examples/widgets-gallery/android/src/main/res/values/strings.xml diff --git a/examples/widgetsgallery/android/src/main/res/values/themes.xml b/examples/widgets-gallery/android/src/main/res/values/themes.xml similarity index 100% rename from examples/widgetsgallery/android/src/main/res/values/themes.xml rename to examples/widgets-gallery/android/src/main/res/values/themes.xml diff --git a/examples/widgetsgallery/build.gradle.kts b/examples/widgets-gallery/build.gradle.kts similarity index 97% rename from examples/widgetsgallery/build.gradle.kts rename to examples/widgets-gallery/build.gradle.kts index 71d44e0f1b..f2cf058181 100644 --- a/examples/widgetsgallery/build.gradle.kts +++ b/examples/widgets-gallery/build.gradle.kts @@ -8,7 +8,7 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc1") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc5") classpath("com.android.tools.build:gradle:7.0.0") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.5.21")) diff --git a/examples/widgetsgallery/common/build.gradle.kts b/examples/widgets-gallery/common/build.gradle.kts similarity index 100% rename from examples/widgetsgallery/common/build.gradle.kts rename to examples/widgets-gallery/common/build.gradle.kts diff --git a/examples/widgetsgallery/common/src/androidMain/AndroidManifest.xml b/examples/widgets-gallery/common/src/androidMain/AndroidManifest.xml similarity index 100% rename from examples/widgetsgallery/common/src/androidMain/AndroidManifest.xml rename to examples/widgets-gallery/common/src/androidMain/AndroidManifest.xml diff --git a/examples/widgetsgallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt b/examples/widgets-gallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt similarity index 100% rename from examples/widgetsgallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt rename to examples/widgets-gallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt diff --git a/examples/widgetsgallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt b/examples/widgets-gallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt similarity index 100% rename from examples/widgetsgallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt rename to examples/widgets-gallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt diff --git a/examples/widgetsgallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt b/examples/widgets-gallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt similarity index 100% rename from examples/widgetsgallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt rename to examples/widgets-gallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt diff --git a/examples/widgetsgallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt b/examples/widgets-gallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt similarity index 100% rename from examples/widgetsgallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt rename to examples/widgets-gallery/common/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/DemoDataProvider.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/DemoDataProvider.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/DemoDataProvider.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/DemoDataProvider.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/model/Item.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/model/Item.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/model/Item.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/model/Item.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/model/Tweet.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/model/Tweet.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/model/Tweet.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/data/model/Tweet.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Res.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Res.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Res.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Res.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Color.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Color.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Color.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Color.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Shape.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Shape.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Shape.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Shape.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Theme.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Theme.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Theme.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Theme.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Type.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Type.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Type.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/theme/Type.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/MainView.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/MainView.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/MainView.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/MainView.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetView.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetView.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetView.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetView.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetsType.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetsType.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetsType.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetsType.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/AppBars.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/AppBars.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/AppBars.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/AppBars.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Buttons.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Buttons.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Buttons.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Buttons.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Chips.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Chips.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Chips.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Chips.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Loaders.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Loaders.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Loaders.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Loaders.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/SnackBars.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/SnackBars.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/SnackBars.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/SnackBars.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/TextInputs.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/TextInputs.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/TextInputs.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/TextInputs.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Texts.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Texts.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Texts.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Texts.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Toggles.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Toggles.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Toggles.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/Toggles.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/UICards.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/UICards.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/UICards.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/screens/UICards.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/LayoutModifiers.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/LayoutModifiers.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/LayoutModifiers.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/LayoutModifiers.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/ResizablePanel.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/ResizablePanel.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/ResizablePanel.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/ResizablePanel.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/Text.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/Text.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/Text.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/Text.kt diff --git a/examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/VerticalSplittable.kt b/examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/VerticalSplittable.kt similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/VerticalSplittable.kt rename to examples/widgets-gallery/common/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/utils/VerticalSplittable.kt diff --git a/examples/widgetsgallery/common/src/commonMain/resources/drawable-nodpi/food6.jpg b/examples/widgets-gallery/common/src/commonMain/resources/drawable-nodpi/food6.jpg similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/resources/drawable-nodpi/food6.jpg rename to examples/widgets-gallery/common/src/commonMain/resources/drawable-nodpi/food6.jpg diff --git a/examples/widgetsgallery/common/src/commonMain/resources/drawable-nodpi/p1.jpeg b/examples/widgets-gallery/common/src/commonMain/resources/drawable-nodpi/p1.jpeg similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/resources/drawable-nodpi/p1.jpeg rename to examples/widgets-gallery/common/src/commonMain/resources/drawable-nodpi/p1.jpeg diff --git a/examples/widgetsgallery/common/src/commonMain/resources/drawable-nodpi/p2.jpeg b/examples/widgets-gallery/common/src/commonMain/resources/drawable-nodpi/p2.jpeg similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/resources/drawable-nodpi/p2.jpeg rename to examples/widgets-gallery/common/src/commonMain/resources/drawable-nodpi/p2.jpeg diff --git a/examples/widgetsgallery/common/src/commonMain/resources/drawable-nodpi/p3.jpeg b/examples/widgets-gallery/common/src/commonMain/resources/drawable-nodpi/p3.jpeg similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/resources/drawable-nodpi/p3.jpeg rename to examples/widgets-gallery/common/src/commonMain/resources/drawable-nodpi/p3.jpeg diff --git a/examples/widgetsgallery/common/src/commonMain/resources/drawable-nodpi/p6.jpeg b/examples/widgets-gallery/common/src/commonMain/resources/drawable-nodpi/p6.jpeg similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/resources/drawable-nodpi/p6.jpeg rename to examples/widgets-gallery/common/src/commonMain/resources/drawable-nodpi/p6.jpeg diff --git a/examples/widgetsgallery/common/src/commonMain/resources/drawable/ic_instagram.xml b/examples/widgets-gallery/common/src/commonMain/resources/drawable/ic_instagram.xml similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/resources/drawable/ic_instagram.xml rename to examples/widgets-gallery/common/src/commonMain/resources/drawable/ic_instagram.xml diff --git a/examples/widgetsgallery/common/src/commonMain/resources/drawable/ic_send.xml b/examples/widgets-gallery/common/src/commonMain/resources/drawable/ic_send.xml similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/resources/drawable/ic_send.xml rename to examples/widgets-gallery/common/src/commonMain/resources/drawable/ic_send.xml diff --git a/examples/widgetsgallery/common/src/commonMain/resources/drawable/ic_twitter.xml b/examples/widgets-gallery/common/src/commonMain/resources/drawable/ic_twitter.xml similarity index 100% rename from examples/widgetsgallery/common/src/commonMain/resources/drawable/ic_twitter.xml rename to examples/widgets-gallery/common/src/commonMain/resources/drawable/ic_twitter.xml diff --git a/examples/widgetsgallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt b/examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt similarity index 84% rename from examples/widgetsgallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt rename to examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt index 32808ee275..1ad6cb3067 100644 --- a/examples/widgetsgallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt +++ b/examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt @@ -3,7 +3,7 @@ package org.jetbrains.compose.demo.widgets.platform import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset -import androidx.compose.ui.input.pointer.awtCursor +import androidx.compose.ui.input.pointer.PointerIcon import androidx.compose.ui.input.pointer.pointerIcon import androidx.compose.ui.input.pointer.pointerMoveFilter import java.awt.Cursor @@ -16,4 +16,4 @@ actual fun Modifier.pointerMoveFilter( @OptIn(ExperimentalComposeUiApi::class) actual fun Modifier.cursorForHorizontalResize(): Modifier = - pointerIcon(awtCursor(Cursor(Cursor.E_RESIZE_CURSOR))) + pointerIcon(PointerIcon(Cursor(Cursor.E_RESIZE_CURSOR))) diff --git a/examples/widgetsgallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt b/examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt similarity index 100% rename from examples/widgetsgallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt rename to examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Resources.kt diff --git a/examples/widgetsgallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt b/examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt similarity index 100% rename from examples/widgetsgallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt rename to examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Scrollbar.kt diff --git a/examples/widgetsgallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt b/examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt similarity index 100% rename from examples/widgetsgallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt rename to examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/System.kt diff --git a/examples/widgetsgallery/desktop/build.gradle.kts b/examples/widgets-gallery/desktop/build.gradle.kts similarity index 100% rename from examples/widgetsgallery/desktop/build.gradle.kts rename to examples/widgets-gallery/desktop/build.gradle.kts diff --git a/examples/widgetsgallery/desktop/src/jvmMain/kotlin/org/jetbrains/compose/demo/widgets/main.kt b/examples/widgets-gallery/desktop/src/jvmMain/kotlin/org/jetbrains/compose/demo/widgets/main.kt similarity index 100% rename from examples/widgetsgallery/desktop/src/jvmMain/kotlin/org/jetbrains/compose/demo/widgets/main.kt rename to examples/widgets-gallery/desktop/src/jvmMain/kotlin/org/jetbrains/compose/demo/widgets/main.kt diff --git a/examples/widgetsgallery/gradle.properties b/examples/widgets-gallery/gradle.properties similarity index 100% rename from examples/widgetsgallery/gradle.properties rename to examples/widgets-gallery/gradle.properties diff --git a/examples/widgetsgallery/gradle/wrapper/gradle-wrapper.jar b/examples/widgets-gallery/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from examples/widgetsgallery/gradle/wrapper/gradle-wrapper.jar rename to examples/widgets-gallery/gradle/wrapper/gradle-wrapper.jar diff --git a/examples/web_landing/gradle/wrapper/gradle-wrapper.properties b/examples/widgets-gallery/gradle/wrapper/gradle-wrapper.properties similarity index 92% rename from examples/web_landing/gradle/wrapper/gradle-wrapper.properties rename to examples/widgets-gallery/gradle/wrapper/gradle-wrapper.properties index 29e4134576..05679dc3c1 100644 --- a/examples/web_landing/gradle/wrapper/gradle-wrapper.properties +++ b/examples/widgets-gallery/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/widgetsgallery/gradlew b/examples/widgets-gallery/gradlew similarity index 100% rename from examples/widgetsgallery/gradlew rename to examples/widgets-gallery/gradlew diff --git a/examples/widgetsgallery/gradlew.bat b/examples/widgets-gallery/gradlew.bat similarity index 100% rename from examples/widgetsgallery/gradlew.bat rename to examples/widgets-gallery/gradlew.bat diff --git a/examples/widgetsgallery/settings.gradle.kts b/examples/widgets-gallery/settings.gradle.kts similarity index 100% rename from examples/widgetsgallery/settings.gradle.kts rename to examples/widgets-gallery/settings.gradle.kts diff --git a/examples/widgetsgallery/third_party/ComposeCookBook_LICENSE.txt b/examples/widgets-gallery/third_party/ComposeCookBook_LICENSE.txt similarity index 100% rename from examples/widgetsgallery/third_party/ComposeCookBook_LICENSE.txt rename to examples/widgets-gallery/third_party/ComposeCookBook_LICENSE.txt diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index 19cdd98384..55ba4595cd 100644 --- a/templates/desktop-template/build.gradle.kts +++ b/templates/desktop-template/build.gradle.kts @@ -5,7 +5,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.5.21" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1-rc2") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1-rc5") } repositories { diff --git a/templates/desktop-template/gradle/wrapper/gradle-wrapper.properties b/templates/desktop-template/gradle/wrapper/gradle-wrapper.properties index af7be50b10..05679dc3c1 100644 --- a/templates/desktop-template/gradle/wrapper/gradle-wrapper.properties +++ b/templates/desktop-template/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts index 5139ae5587..974b55856e 100644 --- a/templates/multiplatform-template/build.gradle.kts +++ b/templates/multiplatform-template/build.gradle.kts @@ -1,6 +1,6 @@ buildscript { // __LATEST_COMPOSE_RELEASE_VERSION__ - val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1-rc2" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1-rc5" repositories { mavenCentral() diff --git a/templates/multiplatform-template/common/build.gradle.kts b/templates/multiplatform-template/common/build.gradle.kts index 11d04fb6fc..4edeb03b78 100644 --- a/templates/multiplatform-template/common/build.gradle.kts +++ b/templates/multiplatform-template/common/build.gradle.kts @@ -16,15 +16,8 @@ kotlin { api(compose.runtime) api(compose.foundation) api(compose.material) - } - } - named("desktopMain") { - dependencies { - // Note, if you develop a library, you should use compose.desktop.common. - // compose.desktop.currentOs should be used in launcher-sourceSet - // (in a separate module for demo project and in testMain). - // With compose.desktop.common you will also lose @Preview functionality - api(compose.desktop.currentOs) + // Needed only for preview. + implementation(compose.preview) } } named("androidMain") { diff --git a/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties b/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties index 7665b0fa93..f371643eed 100644 --- a/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties +++ b/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/templates/web-template/build.gradle.kts b/templates/web-template/build.gradle.kts index e42200d588..57b3384c1e 100644 --- a/templates/web-template/build.gradle.kts +++ b/templates/web-template/build.gradle.kts @@ -5,7 +5,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("multiplatform") version "1.5.21" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version ("1.0.0-alpha1-rc1") + id("org.jetbrains.compose") version ("1.0.0-alpha1-rc5") } repositories { diff --git a/templates/web-template/src/main/kotlin/main.kt b/templates/web-template/src/main/kotlin/main.kt index 40b8da8a84..333561ab9d 100644 --- a/templates/web-template/src/main/kotlin/main.kt +++ b/templates/web-template/src/main/kotlin/main.kt @@ -1,11 +1,28 @@ +import androidx.compose.runtime.* +import org.jetbrains.compose.web.dom.Button import org.jetbrains.compose.web.dom.Div import org.jetbrains.compose.web.dom.Text import org.jetbrains.compose.web.renderComposable fun main() { renderComposable(rootElementId = "root") { - Div { - Text("This is a template!") + Body() + } +} + +@Composable +fun Body() { + var counter by remember { mutableStateOf(0) } + Div { + Text("Clicked: ${counter}") + } + Button( + attrs = { + onClick { _ -> + counter++ + } } + ) { + Text("Click") } }