From d499b350a2615ba5a72f9ae64e545c3cb19912ef Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Wed, 4 Aug 2021 09:41:56 +0300 Subject: [PATCH] Move to 1.0.0-alpha1 --- cef/build.gradle.kts | 4 ++-- cef/gradle/wrapper/gradle-wrapper.properties | 2 +- ci/compose-uber-jar/build.gradle.kts | 3 ++- ci/compose-uber-jar/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- components/gradle.properties | 2 +- components/gradle/wrapper/gradle-wrapper.properties | 2 +- compose/frameworks/support | 2 +- compose/prebuilts/androidx/internal | 2 +- examples/codeviewer/build.gradle.kts | 2 +- examples/falling-balls/build.gradle.kts | 2 +- 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 +- .../todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt | 2 +- examples/web-compose-bird/build.gradle.kts | 2 +- examples/web-getting-started/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 +- .../examples/simple-preview-example/build.gradle.kts | 4 ++-- templates/desktop-template/build.gradle.kts | 3 ++- templates/multiplatform-template/build.gradle.kts | 2 +- templates/web-template/build.gradle.kts | 2 +- tutorials/Getting_Started/README.md | 8 ++++---- web/buildSrc/build.gradle.kts | 2 +- web/gradle.properties | 4 ++-- 28 files changed, 36 insertions(+), 34 deletions(-) diff --git a/cef/build.gradle.kts b/cef/build.gradle.kts index 7631f80c50..38ceaf72f9 100644 --- a/cef/build.gradle.kts +++ b/cef/build.gradle.kts @@ -5,9 +5,9 @@ import kotlin.text.capitalize plugins { // __KOTLIN_COMPOSE_VERSION__ - kotlin("jvm") version "1.4.20" + kotlin("jvm") version "1.5.21" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "0.3.0-build133" + id("org.jetbrains.compose") version "1.0.0-alpha1" id("de.undercouch.download") version "4.1.1" application } diff --git a/cef/gradle/wrapper/gradle-wrapper.properties b/cef/gradle/wrapper/gradle-wrapper.properties index 622ab64a3c..05679dc3c1 100644 --- a/cef/gradle/wrapper/gradle-wrapper.properties +++ b/cef/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ci/compose-uber-jar/build.gradle.kts b/ci/compose-uber-jar/build.gradle.kts index 8067278563..4694ba8830 100644 --- a/ci/compose-uber-jar/build.gradle.kts +++ b/ci/compose-uber-jar/build.gradle.kts @@ -23,6 +23,7 @@ val composeVersion: String by lazy { } dependencies { + implementation("org.jetbrains.compose.desktop:desktop-jvm-macos-x64:$composeVersion") implementation("org.jetbrains.compose.desktop:desktop-jvm-linux-x64:$composeVersion") } @@ -82,4 +83,4 @@ class ComposeUberJarProperties { inline fun Project.typedProperty(name: String): T? = project.findProperty(name) as? T } -} \ No newline at end of file +} diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index 256f3d0886..587b780117 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,3 +1,3 @@ # __LATEST_COMPOSE_RELEASE_VERSION__ -compose.version=0.5.0-build262 +compose.version=1.0.0-alpha1 kotlin.code.style=official diff --git a/ci/compose-uber-jar/gradle/wrapper/gradle-wrapper.properties b/ci/compose-uber-jar/gradle/wrapper/gradle-wrapper.properties index 33682bbbf9..05679dc3c1 100644 --- a/ci/compose-uber-jar/gradle/wrapper/gradle-wrapper.properties +++ b/ci/compose-uber-jar/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/components/gradle.properties b/components/gradle.properties index 67d1d922fa..d61dcdb7a9 100644 --- a/components/gradle.properties +++ b/components/gradle.properties @@ -4,4 +4,4 @@ android.enableJetifier=true kotlin.code.style=official # __LATEST_COMPOSE_RELEASE_VERSION__ -compose.version=0.5.0-build262 \ No newline at end of file +compose.version=1.0.0-alpha1 diff --git a/components/gradle/wrapper/gradle-wrapper.properties b/components/gradle/wrapper/gradle-wrapper.properties index bca17f3656..05679dc3c1 100644 --- a/components/gradle/wrapper/gradle-wrapper.properties +++ b/components/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/compose/frameworks/support b/compose/frameworks/support index 7ab919df67..9b5ede8dc4 160000 --- a/compose/frameworks/support +++ b/compose/frameworks/support @@ -1 +1 @@ -Subproject commit 7ab919df67516862cc75a9f1880e85920fc93cb6 +Subproject commit 9b5ede8dc435293ac09419421528921b8fed27fb diff --git a/compose/prebuilts/androidx/internal b/compose/prebuilts/androidx/internal index 818a882ba7..f37dc6b42f 160000 --- a/compose/prebuilts/androidx/internal +++ b/compose/prebuilts/androidx/internal @@ -1 +1 @@ -Subproject commit 818a882ba70e8603d6a22b17d421c9049926da4c +Subproject commit f37dc6b42fe7838e9e37fbe8a9eb063a1550acd8 diff --git a/examples/codeviewer/build.gradle.kts b/examples/codeviewer/build.gradle.kts index 94ecc6876d..9eb9ff58dd 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-alpha1-rc5") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.5.21")) diff --git a/examples/falling-balls/build.gradle.kts b/examples/falling-balls/build.gradle.kts index 3be79bd592..d8ab110725 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.21" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" + id("org.jetbrains.compose") version "1.0.0-alpha1" } group = "me.user" diff --git a/examples/imageviewer/build.gradle.kts b/examples/imageviewer/build.gradle.kts index c2caa9d99a..4dfe785a85 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-alpha1-rc5") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1") classpath("com.android.tools.build:gradle:4.1.0") classpath(kotlin("gradle-plugin", version = "1.5.21")) } diff --git a/examples/intellij-plugin/build.gradle.kts b/examples/intellij-plugin/build.gradle.kts index dcf8aef387..65048a542c 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.21" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" + id("org.jetbrains.compose") version "1.0.0-alpha1" id("idea") } diff --git a/examples/issues/build.gradle.kts b/examples/issues/build.gradle.kts index ba5a9fa91b..fe1e4f9855 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-alpha1-rc5") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1") classpath("com.android.tools.build:gradle:4.1.0") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.5.21")) diff --git a/examples/notepad/build.gradle.kts b/examples/notepad/build.gradle.kts index 172b524eb4..41fcc4d4d6 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.21" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version ("1.0.0-alpha1-rc5") + id("org.jetbrains.compose") version ("1.0.0-alpha1") } repositories { diff --git a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt index bf88d0dd2f..f742f198ff 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-alpha1-rc5" + private const val VERSION = "1.0.0-alpha1" 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 4504f06ec8..fc1767b3fa 100644 --- a/examples/web-compose-bird/build.gradle.kts +++ b/examples/web-compose-bird/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("multiplatform") version "1.5.21" - id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" + id("org.jetbrains.compose") version "1.0.0-alpha1" } group = "com.theapache64.composebird" version = "1.0.0-alpha01" diff --git a/examples/web-getting-started/build.gradle.kts b/examples/web-getting-started/build.gradle.kts index f0b70f6fdb..6714547436 100644 --- a/examples/web-getting-started/build.gradle.kts +++ b/examples/web-getting-started/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("multiplatform") version "1.5.21" - id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" + id("org.jetbrains.compose") version "1.0.0-alpha1" } repositories { diff --git a/examples/web-landing/build.gradle.kts b/examples/web-landing/build.gradle.kts index 9b07a147a0..89a52beef0 100644 --- a/examples/web-landing/build.gradle.kts +++ b/examples/web-landing/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("multiplatform") version "1.5.21" - id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" + id("org.jetbrains.compose") version "1.0.0-alpha1" } repositories { diff --git a/examples/web-with-react/build.gradle.kts b/examples/web-with-react/build.gradle.kts index b628b81ca3..ee05ce58ab 100644 --- a/examples/web-with-react/build.gradle.kts +++ b/examples/web-with-react/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("multiplatform") version "1.5.21" - id("org.jetbrains.compose") version "1.0.0-alpha1-rc5" + id("org.jetbrains.compose") version "1.0.0-alpha1" } repositories { diff --git a/examples/widgets-gallery/build.gradle.kts b/examples/widgets-gallery/build.gradle.kts index f2cf058181..23253c1fd2 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-alpha1-rc5") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1") classpath("com.android.tools.build:gradle:7.0.0") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.5.21")) diff --git a/idea-plugin/examples/simple-preview-example/build.gradle.kts b/idea-plugin/examples/simple-preview-example/build.gradle.kts index a619d247c0..2f642cb193 100644 --- a/idea-plugin/examples/simple-preview-example/build.gradle.kts +++ b/idea-plugin/examples/simple-preview-example/build.gradle.kts @@ -6,7 +6,7 @@ buildscript { } dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc1") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.5.21")) } @@ -19,4 +19,4 @@ subprojects { maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") google() } -} \ No newline at end of file +} diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index 55ba4595cd..26f1814bb0 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.21" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1-rc5") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1") } repositories { @@ -27,6 +27,7 @@ compose.desktop { mainClass = "MainKt" nativeDistributions { + appResourcesRootDir.set(project.layout.projectDirectory.dir("xxx")) targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) packageName = "KotlinJvmComposeDesktopApplication" packageVersion = "1.0.0" diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts index 974b55856e..e3a349a9cd 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-alpha1-rc5" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1" repositories { mavenCentral() diff --git a/templates/web-template/build.gradle.kts b/templates/web-template/build.gradle.kts index 57b3384c1e..57e88a1176 100644 --- a/templates/web-template/build.gradle.kts +++ b/templates/web-template/build.gradle.kts @@ -5,7 +5,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("multiplatform") version "1.5.21" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version ("1.0.0-alpha1-rc5") + id("org.jetbrains.compose") version ("1.0.0-alpha1") } repositories { diff --git a/tutorials/Getting_Started/README.md b/tutorials/Getting_Started/README.md index 1be9766425..09eb779166 100644 --- a/tutorials/Getting_Started/README.md +++ b/tutorials/Getting_Started/README.md @@ -40,11 +40,11 @@ just search for "Compose Multiplatform". ### Update the wizard plugin -The Сompose plugin version used in the wizard above may be not the last. Update the version of the plugin to the latest available by editing the `build.gradle.kts` file, finding and updating the version information as shown below. In this example the latest version of the plugin was 1.0.0-alpha1-rc1 and a compatible version of kotlin was 1.5.21. For the latest versions, see the [latest versions](https://github.com/JetBrains/compose-jb/releases) site and the [Kotlin](https://kotlinlang.org/) site. +The Сompose plugin version used in the wizard above may be not the last. Update the version of the plugin to the latest available by editing the `build.gradle.kts` file, finding and updating the version information as shown below. In this example the latest version of the plugin was 1.0.0-alpha1 and a compatible version of kotlin was 1.5.21. For the latest versions, see the [latest versions](https://github.com/JetBrains/compose-jb/releases) site and the [Kotlin](https://kotlinlang.org/) site. ``` plugins { kotlin("jvm") version "1.5.21" - id("org.jetbrains.compose") version "1.0.0-alpha1-rc1" + id("org.jetbrains.compose") version "1.0.0-alpha1" } ``` @@ -80,7 +80,7 @@ import org.jetbrains.compose.compose plugins { kotlin("jvm") version "1.5.21" - id("org.jetbrains.compose") version "1.0.0-alpha1-rc1" + id("org.jetbrains.compose") version "1.0.0-alpha1" } repositories { @@ -159,4 +159,4 @@ updates the UI. Running and debugging the `main()` function using run gutter is also supported. -![Application running](screen6.png) \ No newline at end of file +![Application running](screen6.png) diff --git a/web/buildSrc/build.gradle.kts b/web/buildSrc/build.gradle.kts index 53c872a4d0..e1bd854525 100644 --- a/web/buildSrc/build.gradle.kts +++ b/web/buildSrc/build.gradle.kts @@ -10,5 +10,5 @@ repositories { } plugins { - id("org.jetbrains.kotlin.jvm") version "1.5.20" + id("org.jetbrains.kotlin.jvm") version "1.5.21" } diff --git a/web/gradle.properties b/web/gradle.properties index bee463aeb2..0324c2e8bf 100644 --- a/web/gradle.properties +++ b/web/gradle.properties @@ -1,6 +1,6 @@ # __LATEST_COMPOSE_RELEASE_VERSION__ -COMPOSE_CORE_VERSION=1.0.0-alpha1-rc1 -COMPOSE_WEB_VERSION=1.0.0-alpha1-rc1 +COMPOSE_CORE_VERSION=1.0.0-alpha1 +COMPOSE_WEB_VERSION=1.0.0-alpha1 COMPOSE_WEB_BUILD_WITH_EXAMPLES=false compose.web.buildSamples=false compose.web.tests.integration.withFirefox