From 29d3d0763644e9850855a7fc509f0963a14233fa Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 20 Jun 2020 12:57:08 +0300 Subject: [PATCH] Remove stdlib-js-ir and kotlin-test-js-ir from coreLibs projects They do not produce their own deployable artifacts, their output is merged into stdlib-js and kotlin-test-js. Remove coreLibsDist task, because now projects can't be dist'ed selectively. --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3685ea381c6..b4bb66ddfab 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -307,7 +307,6 @@ val coreLibProjects = listOfNotNull( ":kotlin-stdlib", ":kotlin-stdlib-common", ":kotlin-stdlib-js", - ":kotlin-stdlib-js-ir", ":kotlin-stdlib-jdk7", ":kotlin-stdlib-jdk8", ":kotlin-test:kotlin-test-annotations-common", @@ -317,7 +316,6 @@ val coreLibProjects = listOfNotNull( ":kotlin-test:kotlin-test-junit5", ":kotlin-test:kotlin-test-testng", ":kotlin-test:kotlin-test-js".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync }, - ":kotlin-test:kotlin-test-js-ir".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync }, ":kotlin-reflect", ":kotlin-coroutines-experimental-compat" ) @@ -539,7 +537,7 @@ tasks { } } - listOf("clean", "assemble", "install", "dist").forEach { taskName -> + listOf("clean", "assemble", "install").forEach { taskName -> register("coreLibs${taskName.capitalize()}") { coreLibProjects.forEach { projectName -> dependsOn("$projectName:$taskName") } } @@ -548,6 +546,8 @@ tasks { register("coreLibsTest") { (coreLibProjects + listOf( ":kotlin-stdlib:samples", + ":kotlin-stdlib-js-ir", + ":kotlin-test:kotlin-test-js-ir".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync }, ":kotlin-test:kotlin-test-js:kotlin-test-js-it".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync }, ":kotlinx-metadata-jvm", ":tools:binary-compatibility-validator"