Browse Source

Make consistent multi-platform plugin invocation throughout web modules and examples

pull/735/merge
Shagen Ogandzhanian 4 years ago
parent
commit
b1328204b8
  1. 4
      examples/falling_balls_with_web/build.gradle.kts
  2. 2
      examples/web_landing/build.gradle.kts
  3. 11
      web/build.gradle.kts
  4. 3
      web/core/build.gradle.kts
  5. 2
      web/integration-core/build.gradle.kts
  6. 2
      web/integration-widgets/build.gradle.kts
  7. 3
      web/settings.gradle.kts
  8. 2
      web/widgets/build.gradle.kts

4
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 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
plugins { 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" id("org.jetbrains.compose") version "0.0.0-web-dev-13"
} }

2
examples/web_landing/build.gradle.kts

@ -1,5 +1,5 @@
plugins { 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" id("org.jetbrains.compose") version "0.0.0-web-dev-13"
} }

11
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_WEB_VERSION: String by project
val COMPOSE_REPO_USERNAME: String? by project
val COMPOSE_REPO_KEY: String? by project
subprojects { subprojects {
apply(plugin = "maven-publish") apply(plugin = "maven-publish")
@ -15,9 +11,6 @@ subprojects {
pluginManager.withPlugin("maven-publish") { pluginManager.withPlugin("maven-publish") {
configure<PublishingExtension> { configure<PublishingExtension> {
repositories { repositories {
val COMPOSE_REPO_USERNAME: String? by project
val COMPOSE_REPO_KEY: String? by project
maven { maven {
name = "internal" name = "internal"
url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev")

3
web/core/build.gradle.kts

@ -1,5 +1,6 @@
plugins { plugins {
id("kotlin-multiplatform") //id("kotlin-multiplatform")
kotlin("multiplatform")
id("org.jetbrains.compose") id("org.jetbrains.compose")
} }

2
web/integration-core/build.gradle.kts

@ -1,5 +1,5 @@
plugins { plugins {
id("kotlin-multiplatform") kotlin("multiplatform")
id("org.jetbrains.compose") id("org.jetbrains.compose")
} }

2
web/integration-widgets/build.gradle.kts

@ -1,5 +1,5 @@
plugins { plugins {
id("kotlin-multiplatform") kotlin("multiplatform")
id("org.jetbrains.compose") id("org.jetbrains.compose")
} }

3
web/settings.gradle.kts

@ -12,9 +12,12 @@ pluginManagement {
resolutionStrategy { resolutionStrategy {
eachPlugin { eachPlugin {
println("REQ ${requested.id.id}")
if (requested.id.id == "org.jetbrains.compose") { if (requested.id.id == "org.jetbrains.compose") {
println("[build] compose core version: ${extra["COMPOSE_CORE_VERSION"]}") println("[build] compose core version: ${extra["COMPOSE_CORE_VERSION"]}")
useModule("org.jetbrains.compose:org.jetbrains.compose.gradle.plugin:${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")
} }
} }
} }

2
web/widgets/build.gradle.kts

@ -1,5 +1,5 @@
plugins { plugins {
id("kotlin-multiplatform") kotlin("multiplatform")
id("org.jetbrains.compose") id("org.jetbrains.compose")
} }

Loading…
Cancel
Save