From cdce1de62689da9b6e97ac673c269b725e3fe2a3 Mon Sep 17 00:00:00 2001 From: Shagen Ogandzhanian Date: Wed, 19 May 2021 23:43:48 +0200 Subject: [PATCH] Resolve compose plugin version from gradle.properties --- web/build.gradle.kts | 2 +- web/settings.gradle.kts | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/web/build.gradle.kts b/web/build.gradle.kts index 5212c3520b..b31365f7c4 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -2,7 +2,6 @@ import org.gradle.api.publish.PublishingExtension plugins { id("org.jetbrains.kotlin.multiplatform") version("1.4.32") apply(false) - id("org.jetbrains.compose") version "0.0.0-web-dev-12" apply(false) } @@ -45,3 +44,4 @@ subprojects { } } } + diff --git a/web/settings.gradle.kts b/web/settings.gradle.kts index e25f796cfd..05511b99e3 100644 --- a/web/settings.gradle.kts +++ b/web/settings.gradle.kts @@ -9,6 +9,14 @@ pluginManagement { url = uri("https://packages.jetbrains.team/maven/p/ui/dev") } } + + resolutionStrategy { + eachPlugin { + if (requested.id.id == "org.jetbrains.compose") { + useModule("org.jetbrains.compose:org.jetbrains.compose.gradle.plugin:${extra["COMPOSE_CORE_VERSION"]}") + } + } + } } include("web-core")