diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index 0e8c085a..65f52ad9 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -9,18 +9,17 @@ plugins { id("org.jetbrains.compose") version "0.2.0-build132" // __KOTLIN_COMPOSE_VERSION__ kotlin("plugin.allopen") version "1.4.20" - id("kotlinx.benchmark") version "0.2.0-dev-20" + id("kotlinx.benchmark") version "0.3.0" } repositories { - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - maven("https://dl.bintray.com/kotlin/kotlinx") } dependencies { implementation(compose.desktop.currentOs) - implementation("org.jetbrains.kotlinx:kotlinx.benchmark.runtime:0.2.0-dev-20") + implementation("org.jetbrains.kotlinx:kotlinx.benchmark.runtime:0.3.0") } configure { diff --git a/benchmarks/settings.gradle.kts b/benchmarks/settings.gradle.kts index 179db993..bba54344 100644 --- a/benchmarks/settings.gradle.kts +++ b/benchmarks/settings.gradle.kts @@ -2,6 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - maven("https://dl.bintray.com/kotlin/kotlinx") + mavenCentral() } } diff --git a/cef/build.gradle.kts b/cef/build.gradle.kts index 9ff01f6a..7631f80c 100644 --- a/cef/build.gradle.kts +++ b/cef/build.gradle.kts @@ -43,7 +43,7 @@ val cefUnZip = run { repositories { google() - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") // temp maven("https://packages.jetbrains.team/maven/p/ui/dev") diff --git a/ci/compose-uber-jar/build.gradle.kts b/ci/compose-uber-jar/build.gradle.kts index 1effb6bd..8c515833 100644 --- a/ci/compose-uber-jar/build.gradle.kts +++ b/ci/compose-uber-jar/build.gradle.kts @@ -10,7 +10,6 @@ val properties = ComposeUberJarProperties() repositories { mavenCentral() - jcenter() maven(properties.composeRepoUrl) } diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index cd27ceed..cea28ff4 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.4.0-build180 +compose.version=0.4.0-build182 kotlin.code.style=official diff --git a/components/build.gradle.kts b/components/build.gradle.kts index 33aa8d6d..cf94a3dc 100644 --- a/components/build.gradle.kts +++ b/components/build.gradle.kts @@ -1,10 +1,10 @@ buildscript { // __LATEST_COMPOSE_RELEASE_VERSION__ - val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.4.0-build180" + val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.4.0-build182" repositories { google() - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } @@ -18,7 +18,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } diff --git a/examples/codeviewer/build.gradle.kts b/examples/codeviewer/build.gradle.kts index de6fd4a6..86b0c9b5 100644 --- a/examples/codeviewer/build.gradle.kts +++ b/examples/codeviewer/build.gradle.kts @@ -3,13 +3,13 @@ buildscript { // TODO: remove after new build is published mavenLocal() google() - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build180") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build182") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.4.32")) @@ -19,7 +19,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } diff --git a/examples/falling_balls/build.gradle.kts b/examples/falling_balls/build.gradle.kts index e2862036..c88dc24f 100644 --- a/examples/falling_balls/build.gradle.kts +++ b/examples/falling_balls/build.gradle.kts @@ -6,14 +6,13 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.4.32" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "0.4.0-build180" + id("org.jetbrains.compose") version "0.4.0-build182" } group = "me.user" version = "1.0" repositories { - jcenter() mavenCentral() maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } diff --git a/examples/imageviewer/build.gradle.kts b/examples/imageviewer/build.gradle.kts index 1ba21ba4..5907fabb 100755 --- a/examples/imageviewer/build.gradle.kts +++ b/examples/imageviewer/build.gradle.kts @@ -5,13 +5,13 @@ buildscript { includeModule("org.jetbrains.compose", "compose-gradle-plugin") } google() - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build180") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build182") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.4.32")) @@ -22,7 +22,7 @@ allprojects { repositories { mavenLocal() google() - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } diff --git a/examples/intelliJPlugin/build.gradle.kts b/examples/intelliJPlugin/build.gradle.kts index d07128ca..ebb727a2 100644 --- a/examples/intelliJPlugin/build.gradle.kts +++ b/examples/intelliJPlugin/build.gradle.kts @@ -5,14 +5,13 @@ plugins { java kotlin("jvm") version "1.4.32" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "0.4.0-build180" + id("org.jetbrains.compose") version "0.4.0-build182" } group = "org.example" version = "1.0-SNAPSHOT" repositories { - jcenter() mavenCentral() maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } diff --git a/examples/issues/build.gradle.kts b/examples/issues/build.gradle.kts index 43f5e2f6..725a6fdc 100644 --- a/examples/issues/build.gradle.kts +++ b/examples/issues/build.gradle.kts @@ -3,13 +3,13 @@ buildscript { // TODO: remove after new build is published mavenLocal() google() - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build180") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build182") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.4.32")) @@ -20,7 +20,7 @@ allprojects { repositories { mavenLocal() google() - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } diff --git a/examples/widgetsgallery/build.gradle.kts b/examples/widgetsgallery/build.gradle.kts index 14436f4a..012752a9 100644 --- a/examples/widgetsgallery/build.gradle.kts +++ b/examples/widgetsgallery/build.gradle.kts @@ -3,13 +3,13 @@ buildscript { // TODO: remove after new build is published mavenLocal() google() - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build180") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build182") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.4.32")) @@ -19,7 +19,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index 71927969..c2e73cc1 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -12,8 +12,7 @@ subprojects { version = BuildProperties.deployVersion(project) repositories { - maven("https://dl.bintray.com/kotlin/kotlin-dev") - jcenter() + mavenCentral() mavenLocal() } diff --git a/gradle-plugins/compose/src/test/test-projects/application/javaLogger/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/javaLogger/build.gradle index 89d38100..903c8a95 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/javaLogger/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/javaLogger/build.gradle @@ -6,7 +6,6 @@ plugins { repositories { google() mavenCentral() - jcenter() maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } diff --git a/gradle-plugins/compose/src/test/test-projects/application/jvm/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/jvm/build.gradle index a2ce37b4..04db9e8c 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/jvm/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/jvm/build.gradle @@ -8,7 +8,6 @@ plugins { repositories { google() mavenCentral() - jcenter() maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } diff --git a/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/build.gradle.kts index bbdff3b1..0186e15b 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/build.gradle.kts +++ b/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/build.gradle.kts @@ -9,7 +9,6 @@ plugins { repositories { google() mavenCentral() - jcenter() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } diff --git a/gradle-plugins/compose/src/test/test-projects/application/macOptions/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/macOptions/build.gradle index cb70fb32..0ceff664 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/macOptions/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/macOptions/build.gradle @@ -8,7 +8,6 @@ plugins { repositories { google() mavenCentral() - jcenter() maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } diff --git a/gradle-plugins/compose/src/test/test-projects/application/moduleClashCli/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/moduleClashCli/build.gradle index 45f07d36..7c52b3ee 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/moduleClashCli/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/moduleClashCli/build.gradle @@ -7,7 +7,6 @@ subprojects { repositories { google() mavenCentral() - jcenter() maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } diff --git a/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle index a2532d85..585672ef 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle @@ -8,7 +8,6 @@ plugins { repositories { google() mavenCentral() - jcenter() maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } diff --git a/gradle-plugins/compose/src/test/test-projects/application/optionsWithSpaces/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/optionsWithSpaces/build.gradle index c27275e3..05088e35 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/optionsWithSpaces/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/optionsWithSpaces/build.gradle @@ -8,7 +8,6 @@ plugins { repositories { google() mavenCentral() - jcenter() maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } diff --git a/gradle-plugins/compose/src/test/test-projects/application/unpackSkiko/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/unpackSkiko/build.gradle index 7a057f5d..57722d1a 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/unpackSkiko/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/unpackSkiko/build.gradle @@ -8,7 +8,6 @@ plugins { repositories { google() mavenCentral() - jcenter() maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/build.gradle b/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/build.gradle index fec5a41d..072f6aa1 100644 --- a/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/build.gradle @@ -8,7 +8,6 @@ plugins { repositories { google() mavenCentral() - jcenter() maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" } } diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index 3e0e742a..7e55e932 100644 --- a/gradle-plugins/gradle.properties +++ b/gradle-plugins/gradle.properties @@ -6,7 +6,7 @@ kotlin.code.style=official # unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var. # # __LATEST_COMPOSE_RELEASE_VERSION__ -compose.version=0.4.0-build180 +compose.version=0.4.0-build182 # A version of Gradle plugin, that will be published, # unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var. diff --git a/gradle-plugins/settings.gradle.kts b/gradle-plugins/settings.gradle.kts index 7650bcf5..fac5b592 100644 --- a/gradle-plugins/settings.gradle.kts +++ b/gradle-plugins/settings.gradle.kts @@ -1,7 +1,6 @@ pluginManagement { repositories { gradlePluginPortal() - maven("https://dl.bintray.com/kotlin/kotlin-dev") } } diff --git a/idea-plugin/build.gradle.kts b/idea-plugin/build.gradle.kts index a924f370..4e0d3699 100644 --- a/idea-plugin/build.gradle.kts +++ b/idea-plugin/build.gradle.kts @@ -14,7 +14,6 @@ version = properties("deploy.version") repositories { mavenCentral() - jcenter() } intellij { diff --git a/idea-plugin/examples/desktop-project/build.gradle.kts b/idea-plugin/examples/desktop-project/build.gradle.kts index 403ef3c8..7a7398e5 100644 --- a/idea-plugin/examples/desktop-project/build.gradle.kts +++ b/idea-plugin/examples/desktop-project/build.gradle.kts @@ -7,11 +7,12 @@ plugins { } repositories { - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } dependencies { + implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.4") implementation(compose.desktop.currentOs) implementation("org.jetbrains.kotlin:kotlin-reflect") } diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index 54b5b558..73646731 100644 --- a/templates/desktop-template/build.gradle.kts +++ b/templates/desktop-template/build.gradle.kts @@ -5,11 +5,11 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.4.32" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-build180") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-build182") } repositories { - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts index 0e40083c..70b46e58 100644 --- a/templates/multiplatform-template/build.gradle.kts +++ b/templates/multiplatform-template/build.gradle.kts @@ -1,12 +1,12 @@ buildscript { // __LATEST_COMPOSE_RELEASE_VERSION__ - val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-build180" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-build182" repositories { // TODO: remove after new build is published mavenLocal() google() - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } @@ -21,7 +21,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } diff --git a/tools/replace.sh b/tools/replace.sh index 580b080f..7796b845 100755 --- a/tools/replace.sh +++ b/tools/replace.sh @@ -1,7 +1,7 @@ #!/bin/bash ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/.. COMPOSE_OLDVER=0.3.2 -COMPOSE_NEWVER=0.4.0-build180 +COMPOSE_NEWVER=0.4.0-build182 find -E $ROOT -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$COMPOSE_OLDVER/$COMPOSE_NEWVER/g" {} \; APPCOMPAT_OLDVER=1.1.0 APPCOMPAT_NEWVER=1.3.0-beta01 diff --git a/tutorials/Getting_Started/README.md b/tutorials/Getting_Started/README.md index 721b20c8..1e9f4046 100644 --- a/tutorials/Getting_Started/README.md +++ b/tutorials/Getting_Started/README.md @@ -22,7 +22,7 @@ Kotlin support in IDEA IDE starting with the version 2020.3 comes with the new p capable to create a Compose application automatically. Note that JDK must be at least JDK 11, and to use the native distribution -packaging JDK 14 or later must be used. +packaging JDK 15 or later must be used. ![Create new project 1](screen3.png) @@ -32,11 +32,11 @@ packaging JDK 14 or later must be used. ### 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 0.3.0-build152 and a compatible version of kotlin was 1.4.30. For the latest versions, see the [latest versions](https://github.com/JetBrains/compose-jb/tags) 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 0.4.0-build182 and a compatible version of kotlin was 1.4.32. 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.4.30" - id("org.jetbrains.compose") version "0.3.0" + kotlin("jvm") version "1.4.32" + id("org.jetbrains.compose") version "0.4.0-build182" } ``` @@ -71,12 +71,12 @@ Then create `build.gradle.kts` with the following content: import org.jetbrains.compose.compose plugins { - kotlin("jvm") version "1.4.30" - id("org.jetbrains.compose") version "0.3.0" + kotlin("jvm") version "1.4.32" + id("org.jetbrains.compose") version "0.4.0-build182" } repositories { - jcenter() + mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") }