Browse Source

Move tutorials and templates to m1-build57.

pull/43/head
Nikolay Igotti 4 years ago
parent
commit
eb8c7fdd44
  1. 2
      templates/desktop-template/build.gradle.kts
  2. 4
      templates/desktop-template/build_and_run_from_cli_example.sh
  3. 2
      templates/multiplatform-template/build.gradle.kts
  4. 7
      tutorials/Getting_Started/README.md
  5. 4
      tutorials/Scrollbars/README.md

2
templates/desktop-template/build.gradle.kts

@ -2,7 +2,7 @@ import org.jetbrains.compose.compose
plugins { plugins {
kotlin("jvm") version "1.4.0" 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 application
} }

4
templates/desktop-template/build_and_run_from_cli_example.sh

@ -19,9 +19,9 @@ function mavenDep {
} }
PLATFORM=macos PLATFORM=macos
SKIKO_VERSION=0.1.5 SKIKO_VERSION=0.1.10
KOTLIN_VERSION=1.4.0 KOTLIN_VERSION=1.4.0
COMPOSE_VERSION=0.1.0-build53 COMPOSE_VERSION=0.1.0-m1-build57
COROUTINES_VERSION=1.3.6 COROUTINES_VERSION=1.3.6
COLLECTIONS_VERSION=0.3 COLLECTIONS_VERSION=0.3
SPACE_REPO="https://packages.jetbrains.team/maven/p/ui/dev" SPACE_REPO="https://packages.jetbrains.team/maven/p/ui/dev"

2
templates/multiplatform-template/build.gradle.kts

@ -1,5 +1,5 @@
buildscript { 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 { repositories {
google() google()

7
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. The recommended way of building Compose for Desktop projects is by using Gradle.
JetBrains provides a simple way of building Compose for Desktop projects JetBrains provides a simple way of building Compose for Desktop projects
using a special Gradle plugin. 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`. First create a new directory, named `sample`.
```shell script ```shell script
mkdir sample mkdir sample
@ -42,7 +46,7 @@ import org.jetbrains.compose.compose
plugins { plugins {
kotlin("jvm") version "1.4.0" 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 application
} }
@ -94,7 +98,6 @@ fun main() = Window(title = "Compose for Desktop", size = IntSize(300, 300)) {
} }
} }
} }
``` ```
## Running the project ## Running the project

4
tutorials/Scrollbars/README.md

@ -80,7 +80,7 @@ fun TextBox(text: String = "Item") {
Box( Box(
modifier = Modifier.height(32.dp) modifier = Modifier.height(32.dp)
.width(400.dp) .width(400.dp)
.background(color = Color(0, 0, 0, 20)) .background(color = Color(200, 0, 0, 20))
.padding(start = 10.dp), .padding(start = 10.dp),
alignment = Alignment.CenterStart alignment = Alignment.CenterStart
) { ) {
@ -208,7 +208,7 @@ fun main() {
.padding(10.dp) .padding(10.dp)
) { ) {
val state = rememberScrollState(0f) val state = rememberScrollState(0f)
ScrollableColumn( ScrollableColumn(
modifier = Modifier.fillMaxSize().padding(end = 12.dp), modifier = Modifier.fillMaxSize().padding(end = 12.dp),
scrollState = state scrollState = state

Loading…
Cancel
Save