From d1b1c14f19c8b0da93566ce1c70b82dc70c8b036 Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Mon, 10 Oct 2022 11:06:09 +0200 Subject: [PATCH 1/2] Add links to web examples on main README.md (#2379) * Add links to web examples on main README.md * Update README.MD Co-authored-by: Oleksandr Karpovich --- README.md | 5 ++++- examples/web-compose-in-js/README.MD | 5 +++++ examples/web-landing/README.md | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 examples/web-landing/README.md diff --git a/README.md b/README.md index 1cebe2567f..b727723062 100644 --- a/README.md +++ b/README.md @@ -47,12 +47,15 @@ Note that when you use Compose Multiplatform, you setup your project differently * [imageviewer](examples/imageviewer) - Image Viewer application for Android and Desktop * [issues](examples/issues) - GitHub issue tracker with an adaptive UI and ktor-client * [Falling Balls](examples/falling-balls) - Simple game - * [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, written with external navigation library * [todoapp-lite](examples/todoapp-lite) - A simplified version of [todoapp](examples/todoapp), fully based on Compose * [widgets gallery](examples/widgets-gallery) - Gallery of standard widgets * [IDEA plugin](examples/intellij-plugin) - Plugin for IDEA using Compose for Desktop + * [compose-bird](examples/web-compose-bird) - A flappy bird clone using Compose for Web + * [web-landing](examples/web-landing) - A landing page built using Compose for Web (HTML composable api) + * [compose-web-with-react](examples/web-with-react) - Using compose-in-react and react-in-compose + * [compose-web-in-js](examples/web-compose-in-js) - Using Html based composables in js ## Other ## * [artwork](artwork) - design artifacts diff --git a/examples/web-compose-in-js/README.MD b/examples/web-compose-in-js/README.MD index 308b8a383c..1360ca32f3 100644 --- a/examples/web-compose-in-js/README.MD +++ b/examples/web-compose-in-js/README.MD @@ -1,3 +1,8 @@ + +**Run in browser:** + +`./gradlew jsRun` + ### How to use HTML based @Composable functions in JS? Useful links: diff --git a/examples/web-landing/README.md b/examples/web-landing/README.md new file mode 100644 index 0000000000..9543f483ad --- /dev/null +++ b/examples/web-landing/README.md @@ -0,0 +1,4 @@ + +**Run in browser:** + +`./gradlew jsRun` From 4dd1c4a48321ff770dbea6c6774af458613e1df9 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 10 Oct 2022 14:42:01 +0200 Subject: [PATCH 2/2] Update Compose Compiler version to stable (#2381) --- .../org/jetbrains/compose/ComposeCompilerCompatability.kt | 4 ++-- gradle-plugins/gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatability.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatability.kt index 06e16e85fe..cbf3d8bbe6 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatability.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatability.kt @@ -4,9 +4,9 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType internal object ComposeCompilerCompatability { fun compilerVersionFor(kotlinVersion: String): ComposeCompilerVersion? = when (kotlinVersion) { - "1.7.10" -> ComposeCompilerVersion("1.3.0-alpha01") + "1.7.10" -> ComposeCompilerVersion("1.3.0") "1.7.20" -> ComposeCompilerVersion( - "1.3.2-alpha01", + "1.3.2", unsupportedPlatforms = setOf(KotlinPlatformType.js) ) else -> null diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index e6a53ad112..d16b53a8b6 100644 --- a/gradle-plugins/gradle.properties +++ b/gradle-plugins/gradle.properties @@ -4,7 +4,7 @@ kotlin.code.style=official # Default version of Compose Libraries used by Gradle plugin compose.version=1.2.0-beta02 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests. -compose.tests.compiler.version=1.3.2-alpha01 +compose.tests.compiler.version=1.3.2 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests. compose.tests.compiler.compatible.kotlin.version=1.7.20 # The latest version of Kotlin compatible with compose.tests.compiler.version for JS target. Used only on CI.