From d501a6f721af7d9331eefa1a76dc139b3d278f6b Mon Sep 17 00:00:00 2001 From: Shagen Ogandzhanian Date: Thu, 20 May 2021 23:48:16 +0200 Subject: [PATCH] [web] Set group id and version as a simple project properties As opposed to the failed attempt of configurating it via publishing Also: Update path in compose.web.web accordingly --- .../main/kotlin/org/jetbrains/compose/ComposePlugin.kt | 4 ++-- web/build.gradle.kts | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt index b714a5be7f..2fbb60dcdd 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt @@ -151,7 +151,7 @@ class ComposePlugin : Plugin { object WebDependencies { val web by lazy { - composeDependency("org.jetbrains.compose.web:web") + composeDependency("org.jetbrains.compose.web:web-core") } } } @@ -162,4 +162,4 @@ val KotlinDependencyHandler.compose get() = ComposePlugin.Dependencies fun DependencyHandler.compose(groupWithArtifact: String) = composeDependency(groupWithArtifact) val DependencyHandler.compose get() = ComposePlugin.Dependencies -private fun composeDependency(groupWithArtifact: String) = "$groupWithArtifact:$composeVersion" \ No newline at end of file +private fun composeDependency(groupWithArtifact: String) = "$groupWithArtifact:$composeVersion" diff --git a/web/build.gradle.kts b/web/build.gradle.kts index 6fedfd4497..c648ad1278 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -9,15 +9,11 @@ val COMPOSE_WEB_VERSION: String by project subprojects { apply(plugin = "maven-publish") + group = "org.jetbrains.compose.web" + version = COMPOSE_WEB_VERSION + pluginManager.withPlugin("maven-publish") { configure { - publications { - create("maven") { - groupId = "org.jetbrains.compose.web" - version = COMPOSE_WEB_VERSION - } - } - repositories { val COMPOSE_REPO_USERNAME: String? by project val COMPOSE_REPO_KEY: String? by project