diff --git a/examples/falling_balls_with_web/build.gradle.kts b/examples/falling_balls_with_web/build.gradle.kts index 1099b3a638..29498c8a1c 100644 --- 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" diff --git a/examples/compose-bird/.gitignore b/examples/web-compose-bird/.gitignore similarity index 100% rename from examples/compose-bird/.gitignore rename to examples/web-compose-bird/.gitignore diff --git a/examples/compose-bird/README.md b/examples/web-compose-bird/README.md similarity index 100% rename from examples/compose-bird/README.md rename to examples/web-compose-bird/README.md diff --git a/examples/compose-bird/build.gradle.kts b/examples/web-compose-bird/build.gradle.kts similarity index 90% rename from examples/compose-bird/build.gradle.kts rename to examples/web-compose-bird/build.gradle.kts index 7e5c618b52..052eee84e7 100644 --- a/examples/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 { } } } -} \ No newline at end of file +} diff --git a/examples/compose-bird/cover.jpeg b/examples/web-compose-bird/cover.jpeg similarity index 100% rename from examples/compose-bird/cover.jpeg rename to examples/web-compose-bird/cover.jpeg diff --git a/examples/compose-bird/demo.gif b/examples/web-compose-bird/demo.gif similarity index 100% rename from examples/compose-bird/demo.gif rename to examples/web-compose-bird/demo.gif diff --git a/examples/compose-bird/gradle.properties b/examples/web-compose-bird/gradle.properties similarity index 100% rename from examples/compose-bird/gradle.properties rename to examples/web-compose-bird/gradle.properties diff --git a/examples/compose-bird/gradle/wrapper/gradle-wrapper.jar b/examples/web-compose-bird/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from examples/compose-bird/gradle/wrapper/gradle-wrapper.jar rename to examples/web-compose-bird/gradle/wrapper/gradle-wrapper.jar diff --git a/examples/compose-bird/gradle/wrapper/gradle-wrapper.properties b/examples/web-compose-bird/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from examples/compose-bird/gradle/wrapper/gradle-wrapper.properties rename to examples/web-compose-bird/gradle/wrapper/gradle-wrapper.properties diff --git a/examples/compose-bird/gradlew b/examples/web-compose-bird/gradlew similarity index 100% rename from examples/compose-bird/gradlew rename to examples/web-compose-bird/gradlew diff --git a/examples/compose-bird/gradlew.bat b/examples/web-compose-bird/gradlew.bat similarity index 100% rename from examples/compose-bird/gradlew.bat rename to examples/web-compose-bird/gradlew.bat diff --git a/examples/compose-bird/settings.gradle.kts b/examples/web-compose-bird/settings.gradle.kts similarity index 100% rename from examples/compose-bird/settings.gradle.kts rename to examples/web-compose-bird/settings.gradle.kts diff --git a/examples/compose-bird/src/jsMain/kotlin/core/ComposeBirdGame.kt b/examples/web-compose-bird/src/jsMain/kotlin/core/ComposeBirdGame.kt similarity index 100% rename from examples/compose-bird/src/jsMain/kotlin/core/ComposeBirdGame.kt rename to examples/web-compose-bird/src/jsMain/kotlin/core/ComposeBirdGame.kt diff --git a/examples/compose-bird/src/jsMain/kotlin/core/Game.kt b/examples/web-compose-bird/src/jsMain/kotlin/core/Game.kt similarity index 100% rename from examples/compose-bird/src/jsMain/kotlin/core/Game.kt rename to examples/web-compose-bird/src/jsMain/kotlin/core/Game.kt diff --git a/examples/compose-bird/src/jsMain/kotlin/data/GameFrame.kt b/examples/web-compose-bird/src/jsMain/kotlin/data/GameFrame.kt similarity index 100% rename from examples/compose-bird/src/jsMain/kotlin/data/GameFrame.kt rename to examples/web-compose-bird/src/jsMain/kotlin/data/GameFrame.kt diff --git a/examples/compose-bird/src/jsMain/kotlin/data/Tube.kt b/examples/web-compose-bird/src/jsMain/kotlin/data/Tube.kt similarity index 100% rename from examples/compose-bird/src/jsMain/kotlin/data/Tube.kt rename to examples/web-compose-bird/src/jsMain/kotlin/data/Tube.kt diff --git a/examples/compose-bird/src/jsMain/kotlin/main.kt b/examples/web-compose-bird/src/jsMain/kotlin/main.kt similarity index 100% rename from examples/compose-bird/src/jsMain/kotlin/main.kt rename to examples/web-compose-bird/src/jsMain/kotlin/main.kt diff --git a/examples/compose-bird/src/jsMain/resources/index.html b/examples/web-compose-bird/src/jsMain/resources/index.html similarity index 83% rename from examples/compose-bird/src/jsMain/resources/index.html rename to examples/web-compose-bird/src/jsMain/resources/index.html index a6002d8c0e..c237d9bbd2 100644 --- a/examples/compose-bird/src/jsMain/resources/index.html +++ b/examples/web-compose-bird/src/jsMain/resources/index.html @@ -12,6 +12,6 @@
- + - \ No newline at end of file + diff --git a/examples/web-getting-started/build.gradle.kts b/examples/web-getting-started/build.gradle.kts index 8cbb7df95d..96a3a44203 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.10" - id("org.jetbrains.compose") version "0.5.0-build225" + id("org.jetbrains.compose") version "0.5.0-build226" } repositories { diff --git a/examples/web-with-react/build.gradle.kts b/examples/web-with-react/build.gradle.kts index c8ff8b0a92..c530f9b7e6 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.10" - id("org.jetbrains.compose") version "0.5.0-build225" + id("org.jetbrains.compose") version "0.5.0-build226" } repositories { diff --git a/examples/web_landing/build.gradle.kts b/examples/web_landing/build.gradle.kts index 848e05d2f3..c8ea6e8423 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.10" - id("org.jetbrains.compose") version "0.5.0-build225" + id("org.jetbrains.compose") version "0.5.0-build226" } repositories { 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 index 950e27d3bf..0a74c3fdbb 100644 --- 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 -) \ No newline at end of file +) 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 index b674ca358b..3c9605cbe1 100644 --- 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() val wtH3LineHeight by variable() - val wtColCount by variable() + val wtColCount by variable() } @@ -92,4 +92,4 @@ object AppStylesheet : StyleSheet() { property("box-sizing", "border-box") } } -} \ No newline at end of file +} 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 index af030f2b44..525a11018f 100644 --- 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 GenericStyleSheetBuilder.mediaMaxWidth( @@ -125,4 +133,4 @@ object WtCols : StyleSheet(AppStylesheet) { property("max-width", 100.percent) property("flex-basis", "auto") } -} \ No newline at end of file +} diff --git a/templates/web-template/build.gradle.kts b/templates/web-template/build.gradle.kts index 886385cf24..f02010db8f 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.10" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version ("0.5.0-build225") + id("org.jetbrains.compose") version ("0.5.0-build226") } repositories { diff --git a/tutorials/Web/Getting_Started/README.md b/tutorials/Web/Getting_Started/README.md index 9e321a591f..c6d205af67 100644 --- 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 diff --git a/web/benchmark-core/src/jsMain/kotlin/com/sample/style/Stylesheet.kt b/web/benchmark-core/src/jsMain/kotlin/com/sample/style/Stylesheet.kt index 17c147f64d..3c9605cbe1 100644 --- 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() @@ -92,4 +92,4 @@ object AppStylesheet : StyleSheet() { property("box-sizing", "border-box") } } -} \ No newline at end of file +} diff --git a/web/benchmark-core/src/jsMain/kotlin/com/sample/style/WtCol.kt b/web/benchmark-core/src/jsMain/kotlin/com/sample/style/WtCol.kt index c9707223f6..525a11018f 100644 --- 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 GenericStyleSheetBuilder.mediaMaxWidth( value: CSSUnitValue, @@ -125,4 +133,4 @@ object WtCols : StyleSheet(AppStylesheet) { property("max-width", 100.percent) property("flex-basis", "auto") } -} \ No newline at end of file +} diff --git a/web/settings.gradle.kts b/web/settings.gradle.kts index dc4dae2019..7bd88718c9 100644 --- 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") }