From a4fd51a8232b98644a43d875b829821cc9b32a1b Mon Sep 17 00:00:00 2001 From: Anton Bannykh Date: Wed, 21 Mar 2018 14:11:08 +0300 Subject: [PATCH] Merge kotlin-experimental into kotlin standard library (KT-23055 fixed) * kotlin-experimental.js has been already merged into kotlin.js * change library name to kotlin in kotlin-experimental.meta.js in order to produce correct require calls * concatenate kotlin-experimental.meta.js with kotlin.meta.js * suppress multiple module declaration warning for such use case Original commit: 7b860eab368103bc4fda52a0137bc30b1c90ba91 --- .../general/KotlinJavaScriptProject/expected-output.txt | 2 -- .../expected-output.txt | 2 -- .../expected-output.txt | 2 -- .../KotlinJavaScriptProjectWithLibrary/expected-output.txt | 2 -- .../expected-output.txt | 2 -- .../KotlinJavaScriptProjectWithTwoModules/expected-output.txt | 4 ---- 6 files changed, 14 deletions(-) diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProject/expected-output.txt b/jps/jps-plugin/testData/general/KotlinJavaScriptProject/expected-output.txt index 8c9f16fe97e..541f661545e 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProject/expected-output.txt +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProject/expected-output.txt @@ -4,7 +4,5 @@ kotlinProject/ kotlinProject.js kotlinProject.meta.js lib/ - kotlin-experimental.js - kotlin-experimental.meta.js kotlin.js kotlin.meta.js \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/expected-output.txt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/expected-output.txt index c7d9de318a3..b0ae98fc0c7 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/expected-output.txt +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/expected-output.txt @@ -11,8 +11,6 @@ kotlinProject/ file0.js jslib-example.js jslib-example.meta.js - kotlin-experimental.js - kotlin-experimental.meta.js kotlin.js kotlin.meta.js res0.js diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/expected-output.txt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/expected-output.txt index 8c9f16fe97e..541f661545e 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/expected-output.txt +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/expected-output.txt @@ -4,7 +4,5 @@ kotlinProject/ kotlinProject.js kotlinProject.meta.js lib/ - kotlin-experimental.js - kotlin-experimental.meta.js kotlin.js kotlin.meta.js \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/expected-output.txt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/expected-output.txt index c7d9de318a3..b0ae98fc0c7 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/expected-output.txt +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/expected-output.txt @@ -11,8 +11,6 @@ kotlinProject/ file0.js jslib-example.js jslib-example.meta.js - kotlin-experimental.js - kotlin-experimental.meta.js kotlin.js kotlin.meta.js res0.js diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/expected-output.txt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/expected-output.txt index 9fad8b490fd..f1738e23acb 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/expected-output.txt +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/expected-output.txt @@ -7,8 +7,6 @@ kotlinProject/ file0.js jslib-example.js jslib-example.meta.js - kotlin-experimental.js - kotlin-experimental.meta.js kotlin.js kotlin.meta.js res0.js diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/expected-output.txt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/expected-output.txt index 132d5fc6e80..a48c2449988 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/expected-output.txt +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/expected-output.txt @@ -4,14 +4,10 @@ kotlinProject/ kotlinProject.js kotlinProject.meta.js lib/ - kotlin-experimental.js - kotlin-experimental.meta.js kotlin.js kotlin.meta.js module2/ lib/ - kotlin-experimental.js - kotlin-experimental.meta.js kotlin.js kotlin.meta.js module2/