From 50c3a47acd4ce5fbe15096813a277e2de3b86163 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Wed, 5 Apr 2023 19:09:22 +0200 Subject: [PATCH] Fix todo example (#2983) * Fix todo example * Remove comment --------- Co-authored-by: Alexander Maryanovsky --- examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt | 2 +- examples/todoapp/buildSrc/gradle.properties | 2 +- .../src/desktopMain/kotlin/example/todo/common/ui/Scrollbars.kt | 2 +- examples/todoapp/gradle.properties | 2 +- examples/validateExamples.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt index 893cc64ce9..3e959eec51 100644 --- a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt +++ b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt @@ -12,7 +12,7 @@ fun initDeps(project: Project) { object Deps { object JetpackComposeWorkaround { // Workaround for https://github.com/JetBrains/compose-jb/issues/2340 - val VERSION: String = "1.2.1" + val VERSION: String = "1.4.0-rc01" } object JetBrains { diff --git a/examples/todoapp/buildSrc/gradle.properties b/examples/todoapp/buildSrc/gradle.properties index 23c3115e67..b1ad58902d 100755 --- a/examples/todoapp/buildSrc/gradle.properties +++ b/examples/todoapp/buildSrc/gradle.properties @@ -1,3 +1,3 @@ # TODO can we get rid of duplication with root gradle.properties? kotlin.version=1.7.10 -compose.version=1.2.0 +compose.version=1.4.0-rc01 \ No newline at end of file diff --git a/examples/todoapp/common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui/Scrollbars.kt b/examples/todoapp/common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui/Scrollbars.kt index 6071dcb2d0..1a74dac273 100644 --- a/examples/todoapp/common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui/Scrollbars.kt +++ b/examples/todoapp/common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui/Scrollbars.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.unit.dp actual val MARGIN_SCROLLBAR: Dp = 8.dp -actual typealias ScrollbarAdapter = androidx.compose.foundation.ScrollbarAdapter +actual typealias ScrollbarAdapter = androidx.compose.foundation.v2.ScrollbarAdapter @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/examples/todoapp/gradle.properties b/examples/todoapp/gradle.properties index 2d35cbbfb7..53dc9d5050 100755 --- a/examples/todoapp/gradle.properties +++ b/examples/todoapp/gradle.properties @@ -28,4 +28,4 @@ kotlin.native.disableCompilerDaemon=true # in Android module (search "Workaround for https://github.com/JetBrains/compose-jb/issues/2340") #TODO also change version in buildSrc/gradle.properties kotlin.version=1.8.10 -compose.version=1.3.1 +compose.version=1.4.0-rc01 diff --git a/examples/validateExamples.sh b/examples/validateExamples.sh index c563dc950b..6925f607d0 100755 --- a/examples/validateExamples.sh +++ b/examples/validateExamples.sh @@ -24,7 +24,7 @@ runGradle codeviewer packageDistributionForCurrentOS runGradle imageviewer packageDistributionForCurrentOS runGradle issues packageDistributionForCurrentOS runGradle notepad packageDistributionForCurrentOS -runGradle todoapp-lite packageDistributionForCurrentOS # Disabled due to scrollbars until upgrade to compose 1.4.0 +runGradle todoapp-lite packageDistributionForCurrentOS runGradle minesweeper packageDistributionForCurrentOS runGradle visual-effects packageDistributionForCurrentOS runGradle widgets-gallery packageDistributionForCurrentOS