From 36f94875f127260a8b5e4ceda8b5c4ed6f77c410 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 2 Aug 2021 14:55:41 +0300 Subject: [PATCH] Templates. Migrate to 1.0.0-alpha1-rc2 --- templates/desktop-template/build.gradle.kts | 2 +- templates/desktop-template/src/main/kotlin/main.kt | 9 ++++++--- templates/multiplatform-template/build.gradle.kts | 2 +- .../common/src/commonMain/kotlin/App.kt | 7 +++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index 10f1f249c2..2dad821f4c 100644 --- a/templates/desktop-template/build.gradle.kts +++ b/templates/desktop-template/build.gradle.kts @@ -5,7 +5,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.5.21" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1-rc1") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1-rc2") } repositories { diff --git a/templates/desktop-template/src/main/kotlin/main.kt b/templates/desktop-template/src/main/kotlin/main.kt index 3a45be6db2..1c744cb8b6 100644 --- a/templates/desktop-template/src/main/kotlin/main.kt +++ b/templates/desktop-template/src/main/kotlin/main.kt @@ -1,9 +1,12 @@ import androidx.compose.desktop.DesktopMaterialTheme import androidx.compose.desktop.ui.tooling.preview.Preview -import androidx.compose.material.Text import androidx.compose.material.Button -import androidx.compose.material.MaterialTheme -import androidx.compose.runtime.* +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.window.Window import androidx.compose.ui.window.application diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts index 319ca7abd5..5139ae5587 100644 --- a/templates/multiplatform-template/build.gradle.kts +++ b/templates/multiplatform-template/build.gradle.kts @@ -1,6 +1,6 @@ buildscript { // __LATEST_COMPOSE_RELEASE_VERSION__ - val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1-rc1" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1-rc2" repositories { mavenCentral() diff --git a/templates/multiplatform-template/common/src/commonMain/kotlin/App.kt b/templates/multiplatform-template/common/src/commonMain/kotlin/App.kt index fc5b36c595..8595c8b72e 100644 --- a/templates/multiplatform-template/common/src/commonMain/kotlin/App.kt +++ b/templates/multiplatform-template/common/src/commonMain/kotlin/App.kt @@ -1,7 +1,10 @@ import androidx.compose.material.Button -import androidx.compose.material.MaterialTheme import androidx.compose.material.Text -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue @Composable fun App() {