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

Merge kotlin-experimental into kotlin standard library (KT-23055 fixed)

Browse Source 
* 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: 7b860eab36
This commit is contained in:
Anton Bannykh
2018-03-21 14:11:08 +03:00
committed by Anton Bannykh
parent 8a9c76588d
commit a4fd51a823
6 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/testData/general/KotlinJavaScriptProject/expected-output.txt
-2
View File
@@ -4,7 +4,5 @@ kotlinProject/
kotlinProject.js kotlinProject.js
kotlinProject.meta.js kotlinProject.meta.js
lib/ lib/
kotlin-experimental.js
kotlin-experimental.meta.js
kotlin.js kotlin.js
kotlin.meta.js kotlin.meta.js
jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/expected-output.txt
-2
View File
@@ -11,8 +11,6 @@ kotlinProject/
file0.js file0.js
jslib-example.js jslib-example.js
jslib-example.meta.js jslib-example.meta.js
kotlin-experimental.js
kotlin-experimental.meta.js
kotlin.js kotlin.js
kotlin.meta.js kotlin.meta.js
res0.js res0.js
jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/expected-output.txt
-2
View File
@@ -4,7 +4,5 @@ kotlinProject/
kotlinProject.js kotlinProject.js
kotlinProject.meta.js kotlinProject.meta.js
lib/ lib/
kotlin-experimental.js
kotlin-experimental.meta.js
kotlin.js kotlin.js
kotlin.meta.js kotlin.meta.js
jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/expected-output.txt
-2
View File
@@ -11,8 +11,6 @@ kotlinProject/
file0.js file0.js
jslib-example.js jslib-example.js
jslib-example.meta.js jslib-example.meta.js
kotlin-experimental.js
kotlin-experimental.meta.js
kotlin.js kotlin.js
kotlin.meta.js kotlin.meta.js
res0.js res0.js
jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/expected-output.txt
-2
View File
@@ -7,8 +7,6 @@ kotlinProject/
file0.js file0.js
jslib-example.js jslib-example.js
jslib-example.meta.js jslib-example.meta.js
kotlin-experimental.js
kotlin-experimental.meta.js
kotlin.js kotlin.js
kotlin.meta.js kotlin.meta.js
res0.js res0.js
jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/expected-output.txt
-4
View File
@@ -4,14 +4,10 @@ kotlinProject/
kotlinProject.js kotlinProject.js
kotlinProject.meta.js kotlinProject.meta.js
lib/ lib/
kotlin-experimental.js
kotlin-experimental.meta.js
kotlin.js kotlin.js
kotlin.meta.js kotlin.meta.js
module2/ module2/
lib/ lib/
kotlin-experimental.js
kotlin-experimental.meta.js
kotlin.js kotlin.js
kotlin.meta.js kotlin.meta.js
module2/ module2/