From 205b448ea9bf6a0d9d52f5634c24c14de0a0b81a Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Sun, 28 Nov 2021 23:35:56 +0300 Subject: [PATCH] Compose version --- examples/codeviewer/build.gradle.kts | 2 +- examples/falling-balls-web/build.gradle.kts | 2 +- examples/falling-balls/build.gradle.kts | 2 +- examples/falling-balls/settings.gradle.kts | 7 +++++++ examples/imageviewer/build.gradle.kts | 2 +- examples/intellij-plugin/build.gradle.kts | 2 +- examples/issues/build.gradle.kts | 2 +- examples/notepad/build.gradle.kts | 2 +- examples/todoapp-lite/build.gradle.kts | 2 +- examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt | 2 +- examples/web-compose-bird/build.gradle.kts | 2 +- examples/web-landing/build.gradle.kts | 2 +- examples/web-with-react/build.gradle.kts | 2 +- examples/widgets-gallery/build.gradle.kts | 2 +- templates/desktop-template/build.gradle.kts | 2 +- templates/multiplatform-template/build.gradle.kts | 2 +- templates/multiplatform-template/desktop/build.gradle.kts | 1 + templates/web-template/build.gradle.kts | 2 +- 18 files changed, 24 insertions(+), 16 deletions(-) diff --git a/examples/codeviewer/build.gradle.kts b/examples/codeviewer/build.gradle.kts index 9f8d842753..6f6bb632a3 100644 --- a/examples/codeviewer/build.gradle.kts +++ b/examples/codeviewer/build.gradle.kts @@ -8,7 +8,7 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-rc5") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.0.0-feature-test28112021-dev491") classpath("com.android.tools.build:gradle:4.2.2") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.5.31")) diff --git a/examples/falling-balls-web/build.gradle.kts b/examples/falling-balls-web/build.gradle.kts index f3b94f8ae3..b94744546e 100644 --- a/examples/falling-balls-web/build.gradle.kts +++ b/examples/falling-balls-web/build.gradle.kts @@ -4,7 +4,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat plugins { kotlin("multiplatform") version "1.5.31" - id("org.jetbrains.compose") version "1.0.0-rc5" + id("org.jetbrains.compose") version "0.0.0-feature-test28112021-dev491" } version = "1.0-SNAPSHOT" diff --git a/examples/falling-balls/build.gradle.kts b/examples/falling-balls/build.gradle.kts index 28f7a4e532..ad4bb7f76e 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 "1.0.0-rc5" + id("org.jetbrains.compose") version "0.0.0-feature-test28112021-dev491" } group = "me.user" diff --git a/examples/falling-balls/settings.gradle.kts b/examples/falling-balls/settings.gradle.kts index 1fafcc8c2b..edc348b97d 100644 --- a/examples/falling-balls/settings.gradle.kts +++ b/examples/falling-balls/settings.gradle.kts @@ -1 +1,8 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + } +} + rootProject.name = "falling_balls" diff --git a/examples/imageviewer/build.gradle.kts b/examples/imageviewer/build.gradle.kts index 6920b0f64a..50a1c0a338 100755 --- a/examples/imageviewer/build.gradle.kts +++ b/examples/imageviewer/build.gradle.kts @@ -7,7 +7,7 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-rc5") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.0.0-feature-test28112021-dev491") classpath("com.android.tools.build:gradle:4.1.0") classpath(kotlin("gradle-plugin", version = "1.5.31")) } diff --git a/examples/intellij-plugin/build.gradle.kts b/examples/intellij-plugin/build.gradle.kts index d3bbdd05ae..4e7163909e 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-rc5" + id("org.jetbrains.compose") version "0.0.0-feature-test28112021-dev491" id("idea") } diff --git a/examples/issues/build.gradle.kts b/examples/issues/build.gradle.kts index 1bab0e8077..7d9c4a6390 100644 --- a/examples/issues/build.gradle.kts +++ b/examples/issues/build.gradle.kts @@ -8,7 +8,7 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-rc5") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.0.0-feature-test28112021-dev491") classpath("com.android.tools.build:gradle:4.1.3") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.5.31")) diff --git a/examples/notepad/build.gradle.kts b/examples/notepad/build.gradle.kts index 685c3d0482..9ea63598ad 100644 --- a/examples/notepad/build.gradle.kts +++ b/examples/notepad/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 ("1.0.0-rc5") + id("org.jetbrains.compose") version ("0.0.0-feature-test28112021-dev491") } repositories { diff --git a/examples/todoapp-lite/build.gradle.kts b/examples/todoapp-lite/build.gradle.kts index 6920b0f64a..50a1c0a338 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-rc5") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.0.0-feature-test28112021-dev491") classpath("com.android.tools.build:gradle:4.1.0") classpath(kotlin("gradle-plugin", version = "1.5.31")) } diff --git a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt index 8f2791b1ba..6350f74c2a 100644 --- a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt +++ b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt @@ -13,7 +13,7 @@ object Deps { object Compose { // __LATEST_COMPOSE_RELEASE_VERSION__ - private const val VERSION = "1.0.0-rc5" + private const val VERSION = "0.0.0-feature-test28112021-dev491" const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION" } } diff --git a/examples/web-compose-bird/build.gradle.kts b/examples/web-compose-bird/build.gradle.kts index ec5aea6a5e..1f1de70434 100644 --- a/examples/web-compose-bird/build.gradle.kts +++ b/examples/web-compose-bird/build.gradle.kts @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension plugins { kotlin("multiplatform") version "1.5.31" - id("org.jetbrains.compose") version "1.0.0-rc5" + id("org.jetbrains.compose") version "0.0.0-feature-test28112021-dev491" } group = "com.theapache64.composebird" version = "1.0.0-alpha01" diff --git a/examples/web-landing/build.gradle.kts b/examples/web-landing/build.gradle.kts index 543e308c4d..5bc11b3064 100644 --- a/examples/web-landing/build.gradle.kts +++ b/examples/web-landing/build.gradle.kts @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension plugins { kotlin("multiplatform") version "1.5.31" - id("org.jetbrains.compose") version "1.0.0-rc5" + id("org.jetbrains.compose") version "0.0.0-feature-test28112021-dev491" } repositories { diff --git a/examples/web-with-react/build.gradle.kts b/examples/web-with-react/build.gradle.kts index 5c3412811e..e86ede2aec 100644 --- a/examples/web-with-react/build.gradle.kts +++ b/examples/web-with-react/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension plugins { kotlin("multiplatform") version "1.5.31" - id("org.jetbrains.compose") version "1.0.0-rc5" + id("org.jetbrains.compose") version "0.0.0-feature-test28112021-dev491" } repositories { diff --git a/examples/widgets-gallery/build.gradle.kts b/examples/widgets-gallery/build.gradle.kts index ca47b1d07e..e10893ba2c 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:1.0.0-rc5") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.0.0-feature-test28112021-dev491") classpath("com.android.tools.build:gradle:4.2.0") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.5.31")) diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index 9824c70d6f..e791695ff3 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-rc5") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.0.0-feature-test28112021-dev491") } repositories { diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts index 7c9f2800d4..081f12db83 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-rc5" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.0.0-feature-test28112021-dev491" repositories { mavenCentral() diff --git a/templates/multiplatform-template/desktop/build.gradle.kts b/templates/multiplatform-template/desktop/build.gradle.kts index 18042da48d..69203993c3 100644 --- a/templates/multiplatform-template/desktop/build.gradle.kts +++ b/templates/multiplatform-template/desktop/build.gradle.kts @@ -22,6 +22,7 @@ kotlin { compose.desktop { application { + jvmArgs += listOf("-Xmx10M") mainClass = "MainKt" nativeDistributions { diff --git a/templates/web-template/build.gradle.kts b/templates/web-template/build.gradle.kts index c64b07dbfe..fe6f0437ea 100644 --- a/templates/web-template/build.gradle.kts +++ b/templates/web-template/build.gradle.kts @@ -6,7 +6,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("multiplatform") version "1.5.31" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version ("1.0.0-rc5") + id("org.jetbrains.compose") version ("0.0.0-feature-test27112021-dev489") } repositories {