Browse Source

Examples and templates to 1.0.0-beta1 (#1296)

pull/1305/head
Nikolay Igotti 3 years ago committed by GitHub
parent
commit
b176da7128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      examples/falling-balls/build.gradle.kts
  2. 2
      examples/intellij-plugin/build.gradle.kts
  3. 2
      examples/todoapp-lite/build.gradle.kts
  4. 2
      examples/widgets-gallery/build.gradle.kts
  5. 2
      examples/widgets-gallery/common/src/desktopMain/kotlin/org/jetbrains/compose/demo/widgets/platform/Mouse.kt
  6. 2
      templates/desktop-template/build.gradle.kts
  7. 2
      templates/multiplatform-template/build.gradle.kts
  8. 2
      templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties
  9. 12
      templates/web-template/build.gradle.kts
  10. 2
      templates/web-template/gradle/wrapper/gradle-wrapper.properties

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

2
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")
}

2
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"))
}

2
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"))

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

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

2
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()

2
templates/multiplatform-template/gradle/wrapper/gradle-wrapper.properties vendored

@ -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

12
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<NodeJsRootExtension> {
versions.webpackDevServer.version = "4.0.0"
versions.webpackCli.version = "4.9.0"
}
}

2
templates/web-template/gradle/wrapper/gradle-wrapper.properties vendored

@ -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

Loading…
Cancel
Save