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

Revert "Revert [JS IR] commits that failed build"

Browse Source 
This reverts commit 740f851a
This commit is contained in:
Nikolay Krasko
2019-11-05 14:54:48 +03:00
committed by Svyatoslav Kuzmich
parent 181d023e3c
commit 155a760ee9
28 changed files with 427 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prepare/compiler/build.gradle.kts
+1 -3
View File
@@ -91,7 +91,6 @@ val distLibraryProjects = listOfNotNull(
":kotlin-stdlib-js-ir".takeIf { kotlinBuildProperties.jsIrDist },
":kotlin-source-sections-compiler-plugin",
":kotlin-test:kotlin-test-js",
":kotlin-test:kotlin-test-js-ir".takeIf { kotlinBuildProperties.jsIrDist },
":kotlin-test:kotlin-test-junit",
":kotlin-test:kotlin-test-junit5",
":kotlin-test:kotlin-test-jvm",
@@ -114,7 +113,6 @@ val distSourcesProjects = listOfNotNull(
":kotlin-script-runtime",
":kotlin-stdlib-js-ir".takeIf { kotlinBuildProperties.jsIrDist },
":kotlin-test:kotlin-test-js",
":kotlin-test:kotlin-test-js-ir".takeIf { kotlinBuildProperties.jsIrDist },
":kotlin-test:kotlin-test-junit",
":kotlin-test:kotlin-test-junit5",
":kotlin-test:kotlin-test-jvm",
@@ -149,7 +147,7 @@ dependencies {
libraries(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
libraries(commonDep("io.ktor", "ktor-network"))
libraries(kotlinStdlib("jdk8"))
libraries(kotlinStdlib("js"))
libraries(kotlinStdlib("js", "distLibrary"))
distLibraryProjects.forEach {
libraries(project(it)) { isTransitive = false }