From 5fe9d53c3ce2b91ac19a2a23bee120cfd3fbf65d Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Fri, 30 Oct 2020 21:13:45 +0300 Subject: [PATCH] Move few examples to m1-build57 --- examples/imageviewer/build.gradle.kts | 2 +- examples/issues/build.gradle.kts | 2 +- .../kotlin/androidx/ui/examples/jetissues/common/Platform.kt | 4 +++- examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/imageviewer/build.gradle.kts b/examples/imageviewer/build.gradle.kts index 1cb8bd7c32..650ae08c37 100755 --- a/examples/imageviewer/build.gradle.kts +++ b/examples/imageviewer/build.gradle.kts @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev109") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-m1-build57") classpath("org.jetbrains.compose:compose-desktop-application-gradle-plugin:0.1.0-SNAPSHOT") classpath("com.android.tools.build:gradle:4.0.1") classpath(kotlin("gradle-plugin", version = "1.4.0")) diff --git a/examples/issues/build.gradle.kts b/examples/issues/build.gradle.kts index 84d2cd967e..55b201313a 100644 --- a/examples/issues/build.gradle.kts +++ b/examples/issues/build.gradle.kts @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev109") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-m1-build57") classpath("com.android.tools.build:gradle:4.0.1") classpath(kotlin("gradle-plugin", version = "1.4.0")) } diff --git a/examples/issues/common/src/desktopMain/kotlin/androidx/ui/examples/jetissues/common/Platform.kt b/examples/issues/common/src/desktopMain/kotlin/androidx/ui/examples/jetissues/common/Platform.kt index 5d45543108..854c113a96 100644 --- a/examples/issues/common/src/desktopMain/kotlin/androidx/ui/examples/jetissues/common/Platform.kt +++ b/examples/issues/common/src/desktopMain/kotlin/androidx/ui/examples/jetissues/common/Platform.kt @@ -5,6 +5,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.platform.DesktopSelectionContainer import androidx.compose.ui.selection.Selection +import androidx.compose.ui.text.InternalTextApi @Composable actual fun SelectionContainer(children: @Composable () -> Unit) { @@ -17,10 +18,11 @@ actual fun SelectionContainer(children: @Composable () -> Unit) { } @Composable +@OptIn(InternalTextApi::class) actual fun WithoutSelection(children: @Composable () -> Unit) { androidx.compose.ui.selection.SelectionContainer( selection = null, onSelectionChange = {}, children = children ) -} \ No newline at end of file +} diff --git a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt index b144dc3f03..1c0615f907 100644 --- a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt +++ b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt @@ -10,7 +10,7 @@ object Deps { } object Compose { - private const val VERSION = "0.1.0-dev109" + private const val VERSION = "0.1.0-m1-build57" const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION" } }