Browse Source

[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
pull/685/head
Shagen Ogandzhanian 4 years ago
parent
commit
d501a6f721
  1. 4
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt
  2. 10
      web/build.gradle.kts

4
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt

@ -151,7 +151,7 @@ class ComposePlugin : Plugin<Project> {
object WebDependencies { object WebDependencies {
val web by lazy { 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) fun DependencyHandler.compose(groupWithArtifact: String) = composeDependency(groupWithArtifact)
val DependencyHandler.compose get() = ComposePlugin.Dependencies val DependencyHandler.compose get() = ComposePlugin.Dependencies
private fun composeDependency(groupWithArtifact: String) = "$groupWithArtifact:$composeVersion" private fun composeDependency(groupWithArtifact: String) = "$groupWithArtifact:$composeVersion"

10
web/build.gradle.kts

@ -9,15 +9,11 @@ val COMPOSE_WEB_VERSION: String by project
subprojects { subprojects {
apply(plugin = "maven-publish") apply(plugin = "maven-publish")
group = "org.jetbrains.compose.web"
version = COMPOSE_WEB_VERSION
pluginManager.withPlugin("maven-publish") { pluginManager.withPlugin("maven-publish") {
configure<PublishingExtension> { configure<PublishingExtension> {
publications {
create<MavenPublication>("maven") {
groupId = "org.jetbrains.compose.web"
version = COMPOSE_WEB_VERSION
}
}
repositories { repositories {
val COMPOSE_REPO_USERNAME: String? by project val COMPOSE_REPO_USERNAME: String? by project
val COMPOSE_REPO_KEY: String? by project val COMPOSE_REPO_KEY: String? by project

Loading…
Cancel
Save