azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove stdlib-js-ir and kotlin-test-js-ir from coreLibs projects

Browse Source 
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.
This commit is contained in:
Ilya Gorbunov
2020-06-20 12:57:08 +03:00
parent b2e70f9c21
commit 29d3d07636
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+3 -3
View File
@@ -307,7 +307,6 @@ val coreLibProjects = listOfNotNull(
":kotlin-stdlib", ":kotlin-stdlib",
":kotlin-stdlib-common", ":kotlin-stdlib-common",
":kotlin-stdlib-js", ":kotlin-stdlib-js",
":kotlin-stdlib-js-ir",
":kotlin-stdlib-jdk7", ":kotlin-stdlib-jdk7",
":kotlin-stdlib-jdk8", ":kotlin-stdlib-jdk8",
":kotlin-test:kotlin-test-annotations-common", ":kotlin-test:kotlin-test-annotations-common",
@@ -317,7 +316,6 @@ val coreLibProjects = listOfNotNull(
":kotlin-test:kotlin-test-junit5", ":kotlin-test:kotlin-test-junit5",
":kotlin-test:kotlin-test-testng", ":kotlin-test:kotlin-test-testng",
":kotlin-test:kotlin-test-js".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync }, ":kotlin-test:kotlin-test-js".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
":kotlin-test:kotlin-test-js-ir".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
":kotlin-reflect", ":kotlin-reflect",
":kotlin-coroutines-experimental-compat" ":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()}") { register("coreLibs${taskName.capitalize()}") {
coreLibProjects.forEach { projectName -> dependsOn("$projectName:$taskName") } coreLibProjects.forEach { projectName -> dependsOn("$projectName:$taskName") }
} }
@@ -548,6 +546,8 @@ tasks {
register("coreLibsTest") { register("coreLibsTest") {
(coreLibProjects + listOf( (coreLibProjects + listOf(
":kotlin-stdlib:samples", ":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 }, ":kotlin-test:kotlin-test-js:kotlin-test-js-it".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
":kotlinx-metadata-jvm", ":kotlinx-metadata-jvm",
":tools:binary-compatibility-validator" ":tools:binary-compatibility-validator"