From 76c5d036a85a92f7cccea7f62658c478512d466d Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 5 Oct 2020 01:59:03 +0300 Subject: [PATCH] Do not pack source of invisible runtime helpers to stdlib-js Use reference sources of built-in Enum and Comparable instead. KT-42318 --- libraries/stdlib/js-v1/build.gradle | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle index 99e05cb4cb8..675bdf4d70a 100644 --- a/libraries/stdlib/js-v1/build.gradle +++ b/libraries/stdlib/js-v1/build.gradle @@ -274,11 +274,13 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) { jar.dependsOn(libraryJarWithIr) task sourcesJar(type: Jar, dependsOn: compileJs) { - classifier = 'sources' + archiveClassifier.set('sources') includeEmptyDirs false duplicatesStrategy = DuplicatesStrategy.FAIL - from(sourceSets.builtins.allSource) { + from("${builtinsDir}/native/kotlin") { into 'kotlin' + include 'Comparable.kt' + include 'Enum.kt' } from(sourceSets.main.allSource) { into 'kotlin' @@ -294,7 +296,7 @@ task sourcesJar(type: Jar, dependsOn: compileJs) { task distSourcesJar(type: Jar) { dependsOn(sourcesJar, configurations.commonSources) destinationDirectory = file("$buildDir/lib/dist") - archiveClassifier = 'sources' + archiveClassifier.set('sources') duplicatesStrategy = DuplicatesStrategy.FAIL from zipTree(sourcesJar.outputs.files.singleFile)