Browse Source

Fix todo example (#2983)

* Fix todo example

* Remove comment

---------

Co-authored-by: Alexander Maryanovsky <msasha@gmail.com>
pull/2990/head
Igor Demin 2 years ago committed by GitHub
parent
commit
50c3a47acd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt
  2. 2
      examples/todoapp/buildSrc/gradle.properties
  3. 2
      examples/todoapp/common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui/Scrollbars.kt
  4. 2
      examples/todoapp/gradle.properties
  5. 2
      examples/validateExamples.sh

2
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 {

2
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

2
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

2
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

2
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

Loading…
Cancel
Save