Update examples after publishing 0.5.0-build226

4 years ago · 4937918a28
29 changed files with 38 additions and 20 deletions
--- 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.10"
-    id("org.jetbrains.compose") version "0.5.0-build225"
+    id("org.jetbrains.compose") version "0.5.0-build226"
 }

 version = "1.0-SNAPSHOT"
--- a/examples/web-compose-bird/.gitignore
+++ b/examples/web-compose-bird/.gitignore
--- a/examples/web-compose-bird/README.md
+++ b/examples/web-compose-bird/README.md
--- a/examples/web-compose-bird/build.gradle.kts
+++ b/examples/web-compose-bird/build.gradle.kts
@ -1,7 +1,7 @@
 // Add compose gradle plugin
 plugins {
    kotlin("multiplatform") version "1.5.10"
-    id("org.jetbrains.compose") version "0.5.0-build225"
+    id("org.jetbrains.compose") version "0.5.0-build226"
 }
 group = "com.theapache64.composebird"
 version = "1.0.0-alpha01"
@ -25,4 +25,4 @@ kotlin {
            }
        }
    }
-}
+}
--- a/examples/web-compose-bird/cover.jpeg
+++ b/examples/web-compose-bird/cover.jpeg
--- a/examples/web-compose-bird/demo.gif
+++ b/examples/web-compose-bird/demo.gif
--- a/examples/web-compose-bird/gradle.properties
+++ b/examples/web-compose-bird/gradle.properties
--- a/examples/web-compose-bird/gradle/wrapper/gradle-wrapper.jar
+++ b/examples/web-compose-bird/gradle/wrapper/gradle-wrapper.jar
--- a/examples/web-compose-bird/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/web-compose-bird/gradle/wrapper/gradle-wrapper.properties
--- a/examples/web-compose-bird/gradlew
+++ b/examples/web-compose-bird/gradlew
--- a/examples/web-compose-bird/gradlew.bat
+++ b/examples/web-compose-bird/gradlew.bat
--- a/examples/web-compose-bird/settings.gradle.kts
+++ b/examples/web-compose-bird/settings.gradle.kts
--- a/examples/web-compose-bird/src/jsMain/kotlin/core/ComposeBirdGame.kt
+++ b/examples/web-compose-bird/src/jsMain/kotlin/core/ComposeBirdGame.kt
--- a/examples/web-compose-bird/src/jsMain/kotlin/core/Game.kt
+++ b/examples/web-compose-bird/src/jsMain/kotlin/core/Game.kt
--- a/examples/web-compose-bird/src/jsMain/kotlin/data/GameFrame.kt
+++ b/examples/web-compose-bird/src/jsMain/kotlin/data/GameFrame.kt
--- a/examples/web-compose-bird/src/jsMain/kotlin/data/Tube.kt
+++ b/examples/web-compose-bird/src/jsMain/kotlin/data/Tube.kt
--- a/examples/web-compose-bird/src/jsMain/kotlin/main.kt
+++ b/examples/web-compose-bird/src/jsMain/kotlin/main.kt
--- a/examples/web-compose-bird/src/jsMain/resources/index.html
+++ b/examples/web-compose-bird/src/jsMain/resources/index.html
@ -12,6 +12,6 @@
 </head>
 <body>
 <div id="root"></div>
-<script src="compose-bird.js"></script>
+<script src="web-compose-bird.js"></script>
 </body>
-</html>
+</html>
--- 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.10"
-    id("org.jetbrains.compose") version "0.5.0-build225"
+    id("org.jetbrains.compose") version "0.5.0-build226"
 }

 repositories {
--- 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.10"
-	id("org.jetbrains.compose") version "0.5.0-build225"
+	id("org.jetbrains.compose") version "0.5.0-build226"
 }

 repositories {
--- a/examples/web_landing/build.gradle.kts
+++ b/examples/web_landing/build.gradle.kts
@ -1,6 +1,6 @@
 plugins {
    kotlin("multiplatform") version "1.5.10"
-    id("org.jetbrains.compose") version "0.5.0-build225"
+    id("org.jetbrains.compose") version "0.5.0-build226"
 }

 repositories {
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt
@ -9,6 +9,7 @@ import org.jetbrains.compose.web.dom.*
 import com.sample.HighlightJs
 import com.sample.components.ContainerInSection
 import com.sample.style.*
+import org.jetbrains.compose.web.css.keywords.auto
 import org.w3c.dom.HTMLElement

 private fun HTMLElement.setHighlightedCode(code: String) {
@ -272,4 +273,4 @@ fun FormattedCodeSnippet(code: String, language: String = "kotlin") {
 private data class CodeSnippetData(
    val title: String,
    val source: String
-)
+)
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt
@ -20,7 +20,7 @@ object AppCSSVariables : CSSVariables {
    val wtH3FontSize by variable<CSSUnitValue>()
    val wtH3LineHeight by variable<CSSUnitValue>()

-    val wtColCount by variable<Int>()
+    val wtColCount by variable<StylePropertyNumber>()
 }


@ -92,4 +92,4 @@ object AppStylesheet : StyleSheet() {
            property("box-sizing", "border-box")
        }
    }
-}
+}
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCol.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCol.kt
@ -1,6 +1,14 @@
 package com.sample.style

-import org.jetbrains.compose.web.css.*
+import org.jetbrains.compose.web.css.CSSBuilder
+import org.jetbrains.compose.web.css.CSSUnitValue
+import org.jetbrains.compose.web.css.GenericStyleSheetBuilder
+import org.jetbrains.compose.web.css.StyleSheet
+import org.jetbrains.compose.web.css.flexGrow
+import org.jetbrains.compose.web.css.maxWidth
+import org.jetbrains.compose.web.css.media
+import org.jetbrains.compose.web.css.percent
+import org.jetbrains.compose.web.css.px
 import org.jetbrains.compose.web.css.selectors.CSSSelector

 fun <TBuilder> GenericStyleSheetBuilder<TBuilder>.mediaMaxWidth(
@ -125,4 +133,4 @@ object WtCols : StyleSheet(AppStylesheet) {
        property("max-width", 100.percent)
        property("flex-basis", "auto")
    }
-}
+}
--- 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.10"
    // __LATEST_COMPOSE_RELEASE_VERSION__
-    id("org.jetbrains.compose") version ("0.5.0-build225")
+    id("org.jetbrains.compose") version ("0.5.0-build226")
 }

 repositories {
--- a/tutorials/Web/Getting_Started/README.md
+++ b/tutorials/Web/Getting_Started/README.md
@ -43,7 +43,7 @@ pluginManagement {
 // Add compose gradle plugin
 plugins {
    kotlin("multiplatform") version "1.5.10"
-    id("org.jetbrains.compose") version "0.5.0-build225"
+    id("org.jetbrains.compose") version "0.5.0-build226"
 }

 // Add maven repositories
--- a/web/benchmark-core/src/jsMain/kotlin/com/sample/style/Stylesheet.kt
+++ b/web/benchmark-core/src/jsMain/kotlin/com/sample/style/Stylesheet.kt
@ -1,7 +1,7 @@
 package com.sample.style

 import org.jetbrains.compose.web.css.*
-import org.jetbrains.compose.web.css.selectors.*
+import org.jetbrains.compose.web.css.selectors.CSSSelector

 object AppCSSVariables : CSSVariables {
    val wtColorGreyLight by variable<Color>()
@ -92,4 +92,4 @@ object AppStylesheet : StyleSheet() {
            property("box-sizing", "border-box")
        }
    }
-}
+}
--- a/web/benchmark-core/src/jsMain/kotlin/com/sample/style/WtCol.kt
+++ b/web/benchmark-core/src/jsMain/kotlin/com/sample/style/WtCol.kt
@ -1,7 +1,15 @@
 package com.sample.style

-import org.jetbrains.compose.web.css.*
-import org.jetbrains.compose.web.css.selectors.*
+import org.jetbrains.compose.web.css.CSSBuilder
+import org.jetbrains.compose.web.css.CSSUnitValue
+import org.jetbrains.compose.web.css.GenericStyleSheetBuilder
+import org.jetbrains.compose.web.css.StyleSheet
+import org.jetbrains.compose.web.css.flexGrow
+import org.jetbrains.compose.web.css.maxWidth
+import org.jetbrains.compose.web.css.media
+import org.jetbrains.compose.web.css.percent
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.css.selectors.CSSSelector

 fun <TBuilder> GenericStyleSheetBuilder<TBuilder>.mediaMaxWidth(
    value: CSSUnitValue,
@ -125,4 +133,4 @@ object WtCols : StyleSheet(AppStylesheet) {
        property("max-width", 100.percent)
        property("flex-basis", "auto")
    }
-}
+}
--- a/web/settings.gradle.kts
+++ b/web/settings.gradle.kts
@ -37,6 +37,7 @@ if (extra["COMPOSE_WEB_BUILD_WITH_EXAMPLES"]!!.toString().toBoolean() == true) {
    println("building with examples")
    module(":examples:falling_balls_with_web", "../examples/falling_balls_with_web")
    module(":examples:compose-web-lp", "../examples/web_landing")
+    module(":examples:web-compose-bird", "../examples/web-compose-bird")
    module(":examples:web-with-react", "../examples/web-with-react")
    module(":examples:web-getting-started", "../examples/web-getting-started")
 }