Browse Source

Merge remote-tracking branch 'origin/master' into release/1.2

# Conflicts:
#	examples/web-landing/README.md
pull/2382/head v1.2.0-rc01
Igor Demin 2 years ago
parent
commit
3053e17f80
  1. 5
      README.md
  2. 5
      examples/web-compose-in-js/README.MD
  3. 4
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatability.kt
  4. 2
      gradle-plugins/gradle.properties

5
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 * [imageviewer](examples/imageviewer) - Image Viewer application for Android and Desktop
* [issues](examples/issues) - GitHub issue tracker with an adaptive UI and ktor-client * [issues](examples/issues) - GitHub issue tracker with an adaptive UI and ktor-client
* [Falling Balls](examples/falling-balls) - Simple game * [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 * [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](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 * [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 * [widgets gallery](examples/widgets-gallery) - Gallery of standard widgets
* [IDEA plugin](examples/intellij-plugin) - Plugin for IDEA using Compose for Desktop * [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 ## ## Other ##
* [artwork](artwork) - design artifacts * [artwork](artwork) - design artifacts

5
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? ### How to use HTML based @Composable functions in JS?
Useful links: Useful links:

4
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 { internal object ComposeCompilerCompatability {
fun compilerVersionFor(kotlinVersion: String): ComposeCompilerVersion? = when (kotlinVersion) { 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.7.20" -> ComposeCompilerVersion(
"1.3.2-alpha01", "1.3.2",
unsupportedPlatforms = setOf(KotlinPlatformType.js) unsupportedPlatforms = setOf(KotlinPlatformType.js)
) )
else -> null else -> null

2
gradle-plugins/gradle.properties

@ -4,7 +4,7 @@ kotlin.code.style=official
# Default version of Compose Libraries used by Gradle plugin # Default version of Compose Libraries used by Gradle plugin
compose.version=1.2.0-beta02 compose.version=1.2.0-beta02
# The latest version of Compose Compiler used by Gradle plugin. Used only in tests. # 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. # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests.
compose.tests.compiler.compatible.kotlin.version=1.7.20 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. # The latest version of Kotlin compatible with compose.tests.compiler.version for JS target. Used only on CI.

Loading…
Cancel
Save