From b176da712870b11eca1989d0709d4b0a2dfde91d Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Fri, 22 Oct 2021 16:13:33 +0300 Subject: [PATCH] Examples and templates to 1.0.0-beta1 (#1296) --- examples/falling-balls/build.gradle.kts | 2 +- examples/intellij-plugin/build.gradle.kts | 2 +- examples/todoapp-lite/build.gradle.kts | 2 +- examples/widgets-gallery/build.gradle.kts | 2 +- .../jetbrains/compose/demo/widgets/platform/Mouse.kt | 2 +- templates/desktop-template/build.gradle.kts | 2 +- templates/multiplatform-template/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- templates/web-template/build.gradle.kts | 12 +++++++++++- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/examples/falling-balls/build.gradle.kts b/examples/falling-balls/build.gradle.kts index 0fa47ce5db..1ea87a3b64 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-build423" + id("org.jetbrains.compose") version "1.0.0-beta1" } group = "me.user" diff --git a/examples/intellij-plugin/build.gradle.kts b/examples/intellij-plugin/build.gradle.kts index b7e12970c0..ab41df98da 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 "0.0.0-master-build423" + id("org.jetbrains.compose") version "1.0.0-beta1" id("idea") } diff --git a/examples/todoapp-lite/build.gradle.kts b/examples/todoapp-lite/build.gradle.kts index 2fbf98af5d..4d242531dd 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:0.0.0-master-build423") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta1") classpath("com.android.tools.build:gradle:4.1.0") classpath(kotlin("gradle-plugin", version = "1.5.31")) } diff --git a/examples/widgets-gallery/build.gradle.kts b/examples/widgets-gallery/build.gradle.kts index 39074124ac..648acc75d8 100644 --- a/examples/widgets-gallery/build.gradle.kts +++ b/examples/widgets-gallery/build.gradle.kts @@ -8,7 +8,7 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.0.0-master-build413") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta1") classpath("com.android.tools.build:gradle:4.2.0") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.5.31")) diff --git a/examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt b/examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt index fdb54cfdd7..e2010717a9 100644 --- a/examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt +++ b/examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt @@ -17,4 +17,4 @@ actual fun Modifier.pointerMoveFilter( @OptIn(ExperimentalComposeUiApi::class) actual fun Modifier.cursorForHorizontalResize(): Modifier = - Modifier.pointerHoverIcon(PointerIcon.Crosshair) + this.pointerHoverIcon(PointerIcon(Cursor(Cursor.E_RESIZE_CURSOR))) diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index 6b11cac181..90e3a7f353 100644 --- a/templates/desktop-template/build.gradle.kts +++ b/templates/desktop-template/build.gradle.kts @@ -5,7 +5,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.5.31" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha4-build362") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-beta1") } repositories { diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts index a88713839d..838560ced9 100644 --- a/templates/multiplatform-template/build.gradle.kts +++ b/templates/multiplatform-template/build.gradle.kts @@ -1,6 +1,6 @@ buildscript { // __LATEST_COMPOSE_RELEASE_VERSION__ - val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha4-build362" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-beta1" repositories { mavenCentral() diff --git a/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties b/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties index f371643eed..05679dc3c1 100644 --- a/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties +++ b/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/templates/web-template/build.gradle.kts b/templates/web-template/build.gradle.kts index b022c294ef..1ed7c28b10 100644 --- a/templates/web-template/build.gradle.kts +++ b/templates/web-template/build.gradle.kts @@ -1,11 +1,12 @@ import org.jetbrains.compose.compose import org.jetbrains.compose.desktop.application.dsl.TargetFormat +import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("multiplatform") version "1.5.31" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version ("1.0.0-alpha4-build362") + id("org.jetbrains.compose") version ("1.0.0-beta1") } repositories { @@ -31,3 +32,12 @@ kotlin { } } } + +// a temporary workaround for a bug in jsRun invocation - see https://youtrack.jetbrains.com/issue/KT-48273 +afterEvaluate { + rootProject.extensions.configure { + versions.webpackDevServer.version = "4.0.0" + versions.webpackCli.version = "4.9.0" + } +} + diff --git a/templates/web-template/gradle/wrapper/gradle-wrapper.properties b/templates/web-template/gradle/wrapper/gradle-wrapper.properties index 7665b0fa93..05679dc3c1 100644 --- a/templates/web-template/gradle/wrapper/gradle-wrapper.properties +++ b/templates/web-template/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