From b1328204b8727b132ec6e7aac405479c82eae8c5 Mon Sep 17 00:00:00 2001
From: Shagen Ogandzhanian <shagen.ogandzhanian@jetbrains.com>
Date: Tue, 1 Jun 2021 12:39:29 +0200
Subject: [PATCH] Make consistent multi-platform plugin invocation throughout
 web modules and examples

---
 examples/falling_balls_with_web/build.gradle.kts |  4 ++--
 examples/web_landing/build.gradle.kts            |  2 +-
 web/build.gradle.kts                             | 11 ++---------
 web/core/build.gradle.kts                        |  3 ++-
 web/integration-core/build.gradle.kts            |  2 +-
 web/integration-widgets/build.gradle.kts         |  2 +-
 web/settings.gradle.kts                          |  3 +++
 web/widgets/build.gradle.kts                     |  2 +-
 8 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/examples/falling_balls_with_web/build.gradle.kts b/examples/falling_balls_with_web/build.gradle.kts
index daea071a40..2e83b24735 100644
--- a/examples/falling_balls_with_web/build.gradle.kts
+++ b/examples/falling_balls_with_web/build.gradle.kts
@@ -1,8 +1,8 @@
-import org.jetbrains.compose.compose
+import org.jetbrains.compose.compose
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
-    id("org.jetbrains.kotlin.multiplatform") version "1.5.0"
+    kotlin("multiplatform") version "1.5.0"
     id("org.jetbrains.compose") version "0.0.0-web-dev-13"
 }
 
diff --git a/examples/web_landing/build.gradle.kts b/examples/web_landing/build.gradle.kts
index 88363de52b..326a19872b 100644
--- a/examples/web_landing/build.gradle.kts
+++ b/examples/web_landing/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.multiplatform") version "1.5.10"
+    kotlin("multiplatform") version "1.5.0"
     id("org.jetbrains.compose") version "0.0.0-web-dev-13"
 }
 
diff --git a/web/build.gradle.kts b/web/build.gradle.kts
index 32a9892503..4978092a1b 100644
--- a/web/build.gradle.kts
+++ b/web/build.gradle.kts
@@ -1,10 +1,6 @@
-import org.gradle.api.publish.PublishingExtension
-
-plugins {
-    id("org.jetbrains.kotlin.multiplatform") version("1.5.10") apply(false)
-}
-
 val COMPOSE_WEB_VERSION: String by project
+val COMPOSE_REPO_USERNAME: String? by project
+val COMPOSE_REPO_KEY: String? by project
 
 subprojects { 
     apply(plugin = "maven-publish")
@@ -15,9 +11,6 @@ subprojects {
     pluginManager.withPlugin("maven-publish") {
         configure<PublishingExtension> { 
             repositories {
-                val COMPOSE_REPO_USERNAME: String? by project
-                val COMPOSE_REPO_KEY: String? by project
-
                 maven {
                     name = "internal"
                     url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev")
diff --git a/web/core/build.gradle.kts b/web/core/build.gradle.kts
index 863929c57e..31ea84286c 100644
--- a/web/core/build.gradle.kts
+++ b/web/core/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
-    id("kotlin-multiplatform")
+    //id("kotlin-multiplatform")
+    kotlin("multiplatform")
     id("org.jetbrains.compose")
 }
 
diff --git a/web/integration-core/build.gradle.kts b/web/integration-core/build.gradle.kts
index ec34431dde..737dd3ede4 100644
--- a/web/integration-core/build.gradle.kts
+++ b/web/integration-core/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("kotlin-multiplatform")
+    kotlin("multiplatform")
     id("org.jetbrains.compose")
 }
 
diff --git a/web/integration-widgets/build.gradle.kts b/web/integration-widgets/build.gradle.kts
index 1610057b28..2d9c3da24b 100644
--- a/web/integration-widgets/build.gradle.kts
+++ b/web/integration-widgets/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("kotlin-multiplatform")
+    kotlin("multiplatform")
     id("org.jetbrains.compose")
 }
 
diff --git a/web/settings.gradle.kts b/web/settings.gradle.kts
index a4bdc96906..de4efd679c 100644
--- a/web/settings.gradle.kts
+++ b/web/settings.gradle.kts
@@ -12,9 +12,12 @@ pluginManagement {
 
     resolutionStrategy {
         eachPlugin {
+            println("REQ ${requested.id.id}")
             if (requested.id.id == "org.jetbrains.compose") {
                 println("[build] compose core version: ${extra["COMPOSE_CORE_VERSION"]}")
                 useModule("org.jetbrains.compose:org.jetbrains.compose.gradle.plugin:${extra["COMPOSE_CORE_VERSION"]}")
+            } else if (requested.id.id == "org.jetbrains.kotlin.multiplatform") {
+                useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.5.10")
             }
         }
     }
diff --git a/web/widgets/build.gradle.kts b/web/widgets/build.gradle.kts
index fe2e96b3c5..591af75eaa 100644
--- a/web/widgets/build.gradle.kts
+++ b/web/widgets/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("kotlin-multiplatform")
+    kotlin("multiplatform")
     id("org.jetbrains.compose")
 }