From 6b9a7c49893b7bec02b53ca0fb93116c747edd11 Mon Sep 17 00:00:00 2001 From: Shagen Ogandzhanian Date: Wed, 19 May 2021 12:18:38 +0200 Subject: [PATCH] Rename core and integration to web-core and web-integration Also: share logic only between subprojects and make maven publication a default option --- web/build.gradle | 4 +++- web/integration/build.gradle | 2 +- web/integration/src/jsMain/resources/index.html | 2 +- web/settings.gradle | 7 +++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/web/build.gradle b/web/build.gradle index 214239193a..962c1575dd 100644 --- a/web/build.gradle +++ b/web/build.gradle @@ -4,7 +4,9 @@ plugins { } -allprojects { +subprojects { + apply plugin: "maven-publish" + repositories { gradlePluginPortal() mavenCentral() diff --git a/web/integration/build.gradle b/web/integration/build.gradle index 27089b93c6..0de6cf2e77 100644 --- a/web/integration/build.gradle +++ b/web/integration/build.gradle @@ -35,7 +35,7 @@ kotlin { commonMain { dependencies { implementation(compose.runtime) - implementation(project(":core")) + implementation(project(":web-core")) implementation(kotlin("stdlib-common")) } } diff --git a/web/integration/src/jsMain/resources/index.html b/web/integration/src/jsMain/resources/index.html index 98563fc87a..77ef68f965 100644 --- a/web/integration/src/jsMain/resources/index.html +++ b/web/integration/src/jsMain/resources/index.html @@ -7,5 +7,5 @@ - + diff --git a/web/settings.gradle b/web/settings.gradle index 0e29e597a2..95ba4862ca 100644 --- a/web/settings.gradle +++ b/web/settings.gradle @@ -11,5 +11,8 @@ pluginManagement { } } -include "core" -include "integration" +include "web-core" +include "web-integration" + +project(":web-core").projectDir = file("$rootDir/core") +project(":web-integration").projectDir = file("$rootDir/integration")