From d876ecb0c4407250a21dee77a48587cd992ebc51 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Fri, 22 Oct 2021 10:15:19 +0300 Subject: [PATCH] Fix examples, move all of them to Gradle 7.1.1 --- examples/codeviewer/common/build.gradle.kts | 1 - examples/codeviewer/gradle/wrapper/gradle-wrapper.properties | 2 +- examples/falling-balls-web/build.gradle.kts | 5 +++-- .../src/commonMain/kotlin/fallingBalls/Game.kt | 3 +++ .../src/commonMain/kotlin/fallingBalls/Piece.kt | 2 ++ .../src/commonMain/kotlin/fallingBalls/PieceData.kt | 4 +++- .../src/commonMain/kotlin/fallingBalls/fallingBalls.kt | 2 ++ .../src/commonMain/kotlin/modifiers/position.kt | 2 ++ .../src/jsMain/kotlin/modifiers/position.kt | 2 ++ examples/falling-balls/build.gradle.kts | 2 +- .../falling-balls/gradle/wrapper/gradle-wrapper.properties | 2 +- examples/intellij-plugin/build.gradle.kts | 2 +- examples/todoapp-lite/build.gradle.kts | 2 +- examples/web-with-react/build.gradle.kts | 2 +- 14 files changed, 23 insertions(+), 10 deletions(-) diff --git a/examples/codeviewer/common/build.gradle.kts b/examples/codeviewer/common/build.gradle.kts index 1d30687a..9929cd56 100644 --- a/examples/codeviewer/common/build.gradle.kts +++ b/examples/codeviewer/common/build.gradle.kts @@ -28,7 +28,6 @@ kotlin { } named("desktopMain") { kotlin.srcDirs("src/jvmMain/kotlin") - resources.srcDirs("src/commonMain/resources") dependencies { api(compose.desktop.common) } diff --git a/examples/codeviewer/gradle/wrapper/gradle-wrapper.properties b/examples/codeviewer/gradle/wrapper/gradle-wrapper.properties index 7665b0fa..05679dc3 100644 --- a/examples/codeviewer/gradle/wrapper/gradle-wrapper.properties +++ b/examples/codeviewer/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/falling-balls-web/build.gradle.kts b/examples/falling-balls-web/build.gradle.kts index b76ef973..8c51235b 100644 --- a/examples/falling-balls-web/build.gradle.kts +++ b/examples/falling-balls-web/build.gradle.kts @@ -3,8 +3,8 @@ import org.jetbrains.compose.compose import org.jetbrains.compose.desktop.application.dsl.TargetFormat plugins { - kotlin("multiplatform") version "1.5.21" - id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" + kotlin("multiplatform") version "1.5.31" + id("org.jetbrains.compose") version "0.0.0-master-build423" } version = "1.0-SNAPSHOT" @@ -79,5 +79,6 @@ compose.desktop { afterEvaluate { rootProject.extensions.configure { versions.webpackDevServer.version = "4.0.0" + versions.webpackCli.version = "4.9.0" } } diff --git a/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/Game.kt b/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/Game.kt index 0f04b6bb..d1d3e935 100644 --- a/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/Game.kt +++ b/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/Game.kt @@ -6,11 +6,14 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import org.jetbrains.compose.common.ui.unit.IntSize import org.jetbrains.compose.common.core.graphics.Color +import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi import kotlin.random.Random +@OptIn(ExperimentalComposeWebWidgetsApi::class) private fun Color.Companion.random() = Color((0..255).random(), (0..255).random(), (0..255).random()) +@OptIn(ExperimentalComposeWebWidgetsApi::class) abstract class Game { internal var previousTime: Long = Long.MAX_VALUE private var startTime = 0L diff --git a/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/Piece.kt b/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/Piece.kt index ce3fda44..feb1e6b7 100644 --- a/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/Piece.kt +++ b/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/Piece.kt @@ -14,7 +14,9 @@ import org.jetbrains.compose.common.ui.draw.clip import org.jetbrains.compose.common.core.graphics.Color import jetbrains.compose.common.shapes.CircleShape import org.jetbrains.compose.common.demo.position +import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi +@OptIn(ExperimentalComposeWebWidgetsApi::class) @Composable fun Piece(index: Int, piece: PieceData) { val boxSize = 40.dp diff --git a/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/PieceData.kt b/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/PieceData.kt index 8617d166..ce4e40e6 100644 --- a/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/PieceData.kt +++ b/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/PieceData.kt @@ -4,8 +4,10 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.runtime.getValue import org.jetbrains.compose.common.core.graphics.Color +import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi -data class PieceData(val game: Game, val velocity: Float, val color: Color) { +@OptIn(ExperimentalComposeWebWidgetsApi::class) +data class PieceData constructor(val game: Game, val velocity: Float, val color: Color) { var picked: Boolean by mutableStateOf(false) var position: Float by mutableStateOf(0f) diff --git a/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/fallingBalls.kt b/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/fallingBalls.kt index f24f62a8..41bc8e6e 100644 --- a/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/fallingBalls.kt +++ b/examples/falling-balls-web/src/commonMain/kotlin/fallingBalls/fallingBalls.kt @@ -22,7 +22,9 @@ import org.jetbrains.compose.common.ui.size import org.jetbrains.compose.common.core.graphics.Color import org.jetbrains.compose.common.foundation.layout.fillMaxHeight import org.jetbrains.compose.common.foundation.layout.fillMaxWidth +import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi +@OptIn(ExperimentalComposeWebWidgetsApi::class) @Composable fun fallingBalls(game: Game) { Column(Modifier.fillMaxWidth().fillMaxHeight(1f)) { diff --git a/examples/falling-balls-web/src/commonMain/kotlin/modifiers/position.kt b/examples/falling-balls-web/src/commonMain/kotlin/modifiers/position.kt index 795d4ec0..b532814f 100644 --- a/examples/falling-balls-web/src/commonMain/kotlin/modifiers/position.kt +++ b/examples/falling-balls-web/src/commonMain/kotlin/modifiers/position.kt @@ -1,8 +1,10 @@ package org.jetbrains.compose.common.demo import androidx.compose.runtime.Composable +import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi import org.jetbrains.compose.common.ui.Modifier import org.jetbrains.compose.common.ui.unit.Dp +@OptIn(ExperimentalComposeWebWidgetsApi::class) @Composable expect fun Modifier.position(width: Dp, height: Dp): Modifier \ No newline at end of file diff --git a/examples/falling-balls-web/src/jsMain/kotlin/modifiers/position.kt b/examples/falling-balls-web/src/jsMain/kotlin/modifiers/position.kt index decc9ee0..afd89fc9 100644 --- a/examples/falling-balls-web/src/jsMain/kotlin/modifiers/position.kt +++ b/examples/falling-balls-web/src/jsMain/kotlin/modifiers/position.kt @@ -5,12 +5,14 @@ import org.jetbrains.compose.common.ui.Modifier import org.jetbrains.compose.common.foundation.layout.offset import org.jetbrains.compose.common.ui.unit.Dp import org.jetbrains.compose.common.internal.castOrCreate +import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi import org.jetbrains.compose.web.css.top import org.jetbrains.compose.web.css.left import org.jetbrains.compose.web.css.px import org.jetbrains.compose.web.css.position import org.jetbrains.compose.web.css.Position +@OptIn(ExperimentalComposeWebWidgetsApi::class) @Composable actual fun Modifier.position(width: Dp, height: Dp): Modifier = castOrCreate().apply { add { diff --git a/examples/falling-balls/build.gradle.kts b/examples/falling-balls/build.gradle.kts index 72a57467..0fa47ce5 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.31" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "0.0.0-master-build413" + id("org.jetbrains.compose") version "0.0.0-master-build423" } group = "me.user" diff --git a/examples/falling-balls/gradle/wrapper/gradle-wrapper.properties b/examples/falling-balls/gradle/wrapper/gradle-wrapper.properties index 549d8442..05679dc3 100644 --- a/examples/falling-balls/gradle/wrapper/gradle-wrapper.properties +++ b/examples/falling-balls/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/intellij-plugin/build.gradle.kts b/examples/intellij-plugin/build.gradle.kts index dabfecfb..b7e12970 100644 --- a/examples/intellij-plugin/build.gradle.kts +++ b/examples/intellij-plugin/build.gradle.kts @@ -5,7 +5,7 @@ plugins { java kotlin("jvm") version "1.5.31" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "1.0.0-alpha4-build361" + id("org.jetbrains.compose") version "0.0.0-master-build423" id("idea") } diff --git a/examples/todoapp-lite/build.gradle.kts b/examples/todoapp-lite/build.gradle.kts index 5991a858..2fbf98af 100755 --- a/examples/todoapp-lite/build.gradle.kts +++ b/examples/todoapp-lite/build.gradle.kts @@ -7,7 +7,7 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha4-build411") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.0.0-master-build423") classpath("com.android.tools.build:gradle:4.1.0") classpath(kotlin("gradle-plugin", version = "1.5.31")) } diff --git a/examples/web-with-react/build.gradle.kts b/examples/web-with-react/build.gradle.kts index c48753c5..eb8ecf00 100644 --- a/examples/web-with-react/build.gradle.kts +++ b/examples/web-with-react/build.gradle.kts @@ -36,6 +36,6 @@ kotlin { afterEvaluate { rootProject.extensions.configure { versions.webpackDevServer.version = "4.0.0" - versions.webpackCli.version = "4.9.0" + versions.webpackCli.version = "4.9.0" } }