diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index a99f34e900..ffd33fec28 100644 --- a/templates/desktop-template/build.gradle.kts +++ b/templates/desktop-template/build.gradle.kts @@ -2,7 +2,7 @@ import org.jetbrains.compose.compose plugins { kotlin("jvm") version "1.4.0" - id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-dev97") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-m1-build57") application } diff --git a/templates/desktop-template/build_and_run_from_cli_example.sh b/templates/desktop-template/build_and_run_from_cli_example.sh index 643a8ba84b..3d908f4c45 100644 --- a/templates/desktop-template/build_and_run_from_cli_example.sh +++ b/templates/desktop-template/build_and_run_from_cli_example.sh @@ -19,9 +19,9 @@ function mavenDep { } PLATFORM=macos -SKIKO_VERSION=0.1.5 +SKIKO_VERSION=0.1.10 KOTLIN_VERSION=1.4.0 -COMPOSE_VERSION=0.1.0-build53 +COMPOSE_VERSION=0.1.0-m1-build57 COROUTINES_VERSION=1.3.6 COLLECTIONS_VERSION=0.3 SPACE_REPO="https://packages.jetbrains.team/maven/p/ui/dev" diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts index 51718cc3dc..506d7603ed 100644 --- a/templates/multiplatform-template/build.gradle.kts +++ b/templates/multiplatform-template/build.gradle.kts @@ -1,5 +1,5 @@ buildscript { - val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-dev97" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-m1-build57" repositories { google() diff --git a/tutorials/Getting_Started/README.md b/tutorials/Getting_Started/README.md index fe4ca1f996..4340825f10 100644 --- a/tutorials/Getting_Started/README.md +++ b/tutorials/Getting_Started/README.md @@ -21,6 +21,10 @@ The following software has to be preinstalled: The recommended way of building Compose for Desktop projects is by using Gradle. JetBrains provides a simple way of building Compose for Desktop projects using a special Gradle plugin. + +One could clone an existing template [desktop](https://github.com/JetBrains/compose-jb/tree/master/templates/desktop-template) or +[multiplatform](https://github.com/JetBrains/compose-jb/tree/master/templates/multiplatform-template) application templates, or create it from scratch. + First create a new directory, named `sample`. ```shell script mkdir sample @@ -42,7 +46,7 @@ import org.jetbrains.compose.compose plugins { kotlin("jvm") version "1.4.0" - id("org.jetbrains.compose") version "0.1.0-dev97" + id("org.jetbrains.compose") version "0.1.0-m1-build57" application } @@ -94,7 +98,6 @@ fun main() = Window(title = "Compose for Desktop", size = IntSize(300, 300)) { } } } - ``` ## Running the project diff --git a/tutorials/Scrollbars/README.md b/tutorials/Scrollbars/README.md index 57e9a5d49f..b46464cff6 100644 --- a/tutorials/Scrollbars/README.md +++ b/tutorials/Scrollbars/README.md @@ -80,7 +80,7 @@ fun TextBox(text: String = "Item") { Box( modifier = Modifier.height(32.dp) .width(400.dp) - .background(color = Color(0, 0, 0, 20)) + .background(color = Color(200, 0, 0, 20)) .padding(start = 10.dp), alignment = Alignment.CenterStart ) { @@ -208,7 +208,7 @@ fun main() { .padding(10.dp) ) { val state = rememberScrollState(0f) - + ScrollableColumn( modifier = Modifier.fillMaxSize().padding(end = 12.dp), scrollState = state