diff --git a/compose/frameworks/support b/compose/frameworks/support index 883fe193e4..9b5ede8dc4 160000 --- a/compose/frameworks/support +++ b/compose/frameworks/support @@ -1 +1 @@ -Subproject commit 883fe193e46c2ad23b3aa50d4122f97a679b56ea +Subproject commit 9b5ede8dc435293ac09419421528921b8fed27fb diff --git a/examples/codeviewer/build.gradle.kts b/examples/codeviewer/build.gradle.kts index 9cd95bc589..dffa99fada 100644 --- a/examples/codeviewer/build.gradle.kts +++ b/examples/codeviewer/build.gradle.kts @@ -8,10 +8,10 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc1") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ - classpath(kotlin("gradle-plugin", version = "1.5.10")) + classpath(kotlin("gradle-plugin", version = "1.5.21")) } } diff --git a/examples/falling_balls/build.gradle.kts b/examples/falling_balls/build.gradle.kts index 443bf513dc..b046998fee 100644 --- a/examples/falling_balls/build.gradle.kts +++ b/examples/falling_balls/build.gradle.kts @@ -6,7 +6,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.5.21" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "0.5.0-build270" + id("org.jetbrains.compose") version "1.0.0-alpha1-rc1" } group = "me.user" @@ -14,12 +14,12 @@ version = "1.0" repositories { mavenCentral() + google() maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } dependencies { implementation(compose.desktop.currentOs) - implementation(compose.uiTooling) } tasks.withType() { diff --git a/examples/falling_balls/src/main/kotlin/Game.kt b/examples/falling_balls/src/main/kotlin/Game.kt index 9c40763681..0cd10d89d1 100644 --- a/examples/falling_balls/src/main/kotlin/Game.kt +++ b/examples/falling_balls/src/main/kotlin/Game.kt @@ -28,7 +28,7 @@ class Game { var elapsed by mutableStateOf(0L) var score by mutableStateOf(0) - var clicked by mutableStateOf(0) + private var clicked by mutableStateOf(0) var started by mutableStateOf(false) var paused by mutableStateOf(false) diff --git a/examples/widgetsgallery/build.gradle.kts b/examples/widgetsgallery/build.gradle.kts index 1532fa35f3..562ac14c0b 100644 --- a/examples/widgetsgallery/build.gradle.kts +++ b/examples/widgetsgallery/build.gradle.kts @@ -8,10 +8,10 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc1") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ - classpath(kotlin("gradle-plugin", version = "1.5.10")) + classpath(kotlin("gradle-plugin", version = "1.5.21")) } }