Cleanup samples and adjust for rc5

3 years ago · 242ec6bbf9
197 changed files with 53 additions and 43 deletions
--- 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
       * [widgets gallery](examples/widgetsgallery) - Gallery of standard widgets
-       * [IDEA plugin](examples/intelliJPlugin) - Plugin for IDEA using Compose for Desktop      
+       * [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
--- a/compose/frameworks/support
+++ b/compose/frameworks/support
@ -1 +1 @@
-Subproject commit 7ab919df67516862cc75a9f1880e85920fc93cb6
+Subproject commit 9b5ede8dc435293ac09419421528921b8fed27fb
--- a/compose/prebuilts/androidx/internal
+++ b/compose/prebuilts/androidx/internal
@ -1 +1 @@
-Subproject commit 818a882ba70e8603d6a22b17d421c9049926da4c
+Subproject commit f37dc6b42fe7838e9e37fbe8a9eb063a1550acd8
--- a/examples/falling_balls_with_web/build.gradle.kts
+++ b/examples/falling_balls_with_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"
--- a/examples/falling-balls-web/gradle/wrapper/gradle-wrapper.jar
+++ b/examples/falling-balls-web/gradle/wrapper/gradle-wrapper.jar
--- a/examples/falling-balls-web/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/falling-balls-web/gradle/wrapper/gradle-wrapper.properties
--- a/examples/falling-balls-web/gradlew
+++ b/examples/falling-balls-web/gradlew
--- a/examples/falling_balls_with_web/gradlew.bat
+++ b/examples/falling_balls_with_web/gradlew.bat
--- a/examples/falling_balls_with_web/settings.gradle.kts
+++ b/examples/falling_balls_with_web/settings.gradle.kts
--- a/examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/Game.kt
+++ b/examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/Game.kt
--- a/examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/Piece.kt
+++ b/examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/Piece.kt
--- a/examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/PieceData.kt
+++ b/examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/PieceData.kt
--- a/examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/fallingBalls.kt
+++ b/examples/falling_balls_with_web/src/commonMain/kotlin/fallingBalls/fallingBalls.kt
--- a/examples/falling_balls_with_web/src/commonMain/kotlin/modifiers/position.kt
+++ b/examples/falling_balls_with_web/src/commonMain/kotlin/modifiers/position.kt
--- a/examples/falling_balls_with_web/src/jsMain/kotlin/androidx/compose/web/with-web/App.kt
+++ b/examples/falling_balls_with_web/src/jsMain/kotlin/androidx/compose/web/with-web/App.kt
--- a/examples/falling_balls_with_web/src/jsMain/kotlin/modifiers/position.kt
+++ b/examples/falling_balls_with_web/src/jsMain/kotlin/modifiers/position.kt
--- a/examples/falling_balls_with_web/src/jsMain/resources/index.html
+++ b/examples/falling_balls_with_web/src/jsMain/resources/index.html
--- a/examples/falling_balls_with_web/src/jsMain/resources/styles.css
+++ b/examples/falling_balls_with_web/src/jsMain/resources/styles.css
--- a/examples/falling_balls_with_web/src/jvmMain/kotlin/App.kt
+++ b/examples/falling_balls_with_web/src/jvmMain/kotlin/App.kt
--- a/examples/falling_balls_with_web/src/jvmMain/kotlin/modifiers/position.kt
+++ b/examples/falling_balls_with_web/src/jvmMain/kotlin/modifiers/position.kt
--- a/examples/falling-balls/.gitignore
+++ b/examples/falling-balls/.gitignore
--- 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"
--- a/examples/falling-balls/gradle.properties
+++ b/examples/falling-balls/gradle.properties
--- a/examples/falling_balls_with_web/gradle/wrapper/gradle-wrapper.jar
+++ b/examples/falling_balls_with_web/gradle/wrapper/gradle-wrapper.jar
--- a/examples/falling-balls/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/falling-balls/gradle/wrapper/gradle-wrapper.properties
--- a/examples/falling_balls_with_web/gradlew
+++ b/examples/falling_balls_with_web/gradlew
--- a/examples/falling-balls/gradlew.bat
+++ b/examples/falling-balls/gradlew.bat
--- a/examples/falling-balls/settings.gradle.kts
+++ b/examples/falling-balls/settings.gradle.kts
--- a/examples/falling-balls/src/main/kotlin/Game.kt
+++ b/examples/falling-balls/src/main/kotlin/Game.kt
--- a/examples/falling-balls/src/main/kotlin/Piece.kt
+++ b/examples/falling-balls/src/main/kotlin/Piece.kt
--- a/examples/falling-balls/src/main/kotlin/main.kt
+++ b/examples/falling-balls/src/main/kotlin/main.kt
--- 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"))
    }
 }
--- a/examples/intellij-plugin/.gitignore
+++ b/examples/intellij-plugin/.gitignore
--- a/examples/intellij-plugin/README.md
+++ b/examples/intellij-plugin/README.md
--- a/examples/intellij-plugin/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")
 }

--- a/examples/intellij-plugin/gradle.properties
+++ b/examples/intellij-plugin/gradle.properties
--- a/examples/intellij-plugin/gradle/wrapper/gradle-wrapper.jar
+++ b/examples/intellij-plugin/gradle/wrapper/gradle-wrapper.jar
--- a/examples/intellij-plugin/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
--- a/examples/intellij-plugin/gradlew
+++ b/examples/intellij-plugin/gradlew
--- a/examples/intellij-plugin/gradlew.bat
+++ b/examples/intellij-plugin/gradlew.bat
--- a/examples/intellij-plugin/screenshots/screenshot.png
+++ b/examples/intellij-plugin/screenshots/screenshot.png
--- a/examples/intellij-plugin/screenshots/toolsshow.png
+++ b/examples/intellij-plugin/screenshots/toolsshow.png
--- a/examples/intellij-plugin/settings.gradle.kts
+++ b/examples/intellij-plugin/settings.gradle.kts
--- a/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/ComposeDemoAction.kt
+++ b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/ComposeDemoAction.kt
--- a/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Color.kt
+++ b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Color.kt
--- a/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Shape.kt
+++ b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Shape.kt
--- a/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Theme.kt
+++ b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Theme.kt
--- a/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Type.kt
+++ b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/Type.kt
--- a/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/intellij/SwingColor.kt
+++ b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/intellij/SwingColor.kt
--- a/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/intellij/ThemeChangeListener.kt
+++ b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/theme/intellij/ThemeChangeListener.kt
--- a/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/Buttons.kt
+++ b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/Buttons.kt
--- a/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/LazyScrollable.kt
+++ b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/LazyScrollable.kt
--- a/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/Loaders.kt
+++ b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/Loaders.kt
--- a/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/TextInputs.kt
+++ b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/TextInputs.kt
--- a/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/Toggles.kt
+++ b/examples/intellij-plugin/src/main/kotlin/com/jetbrains/compose/widgets/Toggles.kt
--- a/examples/intellij-plugin/src/main/resources/META-INF/plugin.xml
+++ b/examples/intellij-plugin/src/main/resources/META-INF/plugin.xml
--- 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"))
    }
--- 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 {
--- 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"
        }
    }
--- 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"
--- 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
--- 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 {
--- 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
--- a/examples/web-landing/.gitignore
+++ b/examples/web-landing/.gitignore
--- 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 {
--- a/examples/web-landing/gradle.properties
+++ b/examples/web-landing/gradle.properties
--- a/examples/web-landing/gradle/wrapper/gradle-wrapper.jar
+++ b/examples/web-landing/gradle/wrapper/gradle-wrapper.jar
--- a/examples/falling_balls_with_web/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/falling_balls_with_web/gradle/wrapper/gradle-wrapper.properties
--- a/examples/web-landing/gradlew
+++ b/examples/web-landing/gradlew
--- a/examples/web-landing/gradlew.bat
+++ b/examples/web-landing/gradlew.bat
--- a/examples/web-landing/license/LICENSE.txt
+++ b/examples/web-landing/license/LICENSE.txt
--- a/examples/web-landing/license/third_party/README.md
+++ b/examples/web-landing/license/third_party/README.md
--- a/examples/web-landing/license/third_party/highlightjs.txt
+++ b/examples/web-landing/license/third_party/highlightjs.txt
--- a/examples/web-landing/settings.gradle.kts
+++ b/examples/web-landing/settings.gradle.kts
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/HighlightJs.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/HighlightJs.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/Main.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/Main.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/components/Card.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/components/Card.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/components/Layout.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/components/Layout.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/content/Footer.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/content/Footer.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/content/GetStartedSection.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/content/GetStartedSection.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/content/Header.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/content/Header.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/content/IntroSection.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/content/IntroSection.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/content/JoinUs.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/content/JoinUs.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtCard.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtCard.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtCol.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtCol.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtContainer.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtContainer.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtDisplay.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtDisplay.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtOffest.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtOffest.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtRow.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtRow.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtSection.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtSection.kt
--- a/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtText.kt
+++ b/examples/web-landing/src/jsMain/kotlin/com/sample/style/WtText.kt
--- a/examples/web-landing/src/jsMain/resources/favicon-32x32.png
+++ b/examples/web-landing/src/jsMain/resources/favicon-32x32.png
--- a/examples/web-landing/src/jsMain/resources/hljs.css
+++ b/examples/web-landing/src/jsMain/resources/hljs.css
--- a/examples/web-landing/src/jsMain/resources/i1.svg
+++ b/examples/web-landing/src/jsMain/resources/i1.svg
--- a/examples/web-landing/src/jsMain/resources/ic_fb.svg
+++ b/examples/web-landing/src/jsMain/resources/ic_fb.svg
--- a/examples/web-landing/src/jsMain/resources/ic_feed.svg
+++ b/examples/web-landing/src/jsMain/resources/ic_feed.svg
--- a/Show More
+++ b/Show More