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

Change policy with legacy compiler backend

Browse Source 
[JS] Remove incremental js jps test

[JS] Remove test of maven js archetype

[JS] Fix another one test

[JS] Fix tests for jps

[JS] Try to fix maven test data

[JS] Fix test data

[JS] Fix test data for ant

[JS] Fix jsExtraHelp test

[JS] Fix test run from not-Gradle build tools

[JS] Set flag without compiler error

[JS] Disable warnings and errors in legacy compiler called from Gradle

[JS] Proofread messages

[JS] Not proofread messages

KT-42326
This commit is contained in:
Ilya Goncharov
2022-09-29 13:56:30 +00:00
committed by Space Team
parent a3ad0a6e88
commit c726360ad2
113 changed files with 498 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.kt
+6
View File
@@ -319,6 +319,12 @@ class K2JSCompilerArguments : CommonCompilerArguments() {
@Argument(value = "-Xwasm-enable-asserts", description = "Turn on asserts") @Argument(value = "-Xwasm-enable-asserts", description = "Turn on asserts")
var wasmEnableAsserts: Boolean by FreezableVar(false) var wasmEnableAsserts: Boolean by FreezableVar(false)
@Argument(
value = "-Xuse-deprecated-legacy-compiler",
description = "Use deprecated legacy compiler without error"
)
var useDeprecatedLegacyCompiler: Boolean by FreezableVar(false)
@Argument( @Argument(
value = "-Xlegacy-deprecated-no-warn", value = "-Xlegacy-deprecated-no-warn",
description = "Disable warnings of deprecation of legacy compiler" description = "Disable warnings of deprecation of legacy compiler"
compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java
+15 -1
View File
@@ -186,8 +186,22 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
return exitCode; return exitCode;
} }
String deprecatedMessage = "==========\n" +
"This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.\n" +
"\n" +
"Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).\n" +
"Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.\n" +
"\n" +
"You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.\n" +
"==========";
if (!arguments.getUseDeprecatedLegacyCompiler()) {
messageCollector.report(ERROR, deprecatedMessage, null);
return COMPILATION_ERROR;
}
if (!arguments.getLegacyDeprecatedNoWarn()) { if (!arguments.getLegacyDeprecatedNoWarn()) {
messageCollector.report(STRONG_WARNING, "Legacy compiler is deprecated. Please migrate onto IR.", null); messageCollector.report(STRONG_WARNING, deprecatedMessage, null);
} }
if (arguments.getFreeArgs().isEmpty() && (!incrementalCompilationIsEnabledForJs(arguments))) { if (arguments.getFreeArgs().isEmpty() && (!incrementalCompilationIsEnabledForJs(arguments))) {
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerTest.kt
+1
View File
@@ -42,6 +42,7 @@ abstract class AbstractIncrementalJsCompilerRunnerTest : AbstractIncrementalComp
outputFile = File(destinationDir, "${testDir.name}.js").path outputFile = File(destinationDir, "${testDir.name}.js").path
sourceMap = true sourceMap = true
metaInfo = true metaInfo = true
useDeprecatedLegacyCompiler = true
} }
protected open val scopeExpansionMode = CompileScopeExpansionMode.NEVER protected open val scopeExpansionMode = CompileScopeExpansionMode.NEVER
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiModuleJsCompilerRunnerTest.kt
+1
View File
@@ -28,6 +28,7 @@ abstract class AbstractIncrementalMultiModuleJsCompilerRunnerTest :
K2JSCompilerArguments().apply { K2JSCompilerArguments().apply {
sourceMap = true sourceMap = true
metaInfo = true metaInfo = true
useDeprecatedLegacyCompiler = true
} }
override fun makeForSingleModule( override fun makeForSingleModule(
compiler/testData/cli/js/createMetadata.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
compiler/testData/integration/ant/js/simpleWithoutStdlibAndFolderAsAnotherLib/jslib-example/LibraryExample.kt compiler/testData/integration/ant/js/simpleWithoutStdlibAndFolderAsAnotherLib/jslib-example/LibraryExample.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-meta-info -meta-info
-output -output
$TEMP_DIR$/jslib-example.js $TEMP_DIR$/jslib-example.js
compiler/testData/cli/js/emptySources.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TEMP_DIR$ $TEMP_DIR$
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-no-stdlib -no-stdlib
-output -output
$TESTDATA_DIR$ $TESTDATA_DIR$
compiler/testData/cli/js/inlineCycle.args
Vendored
+1
View File
@@ -1,4 +1,5 @@
$TESTDATA_DIR$/inlineCycle.kt $TESTDATA_DIR$/inlineCycle.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-output -output
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/js/jsExtraHelp.out
Vendored
+2
View File
@@ -44,6 +44,8 @@ where advanced options include:
-Xrepositories=<path> Paths to additional places where libraries could be found -Xrepositories=<path> Paths to additional places where libraries could be found
-Xstrict-implicit-export-types Generate strict types for implicitly exported entities inside d.ts files. Available in IR backend only. -Xstrict-implicit-export-types Generate strict types for implicitly exported entities inside d.ts files. Available in IR backend only.
-Xtyped-arrays Translate primitive arrays to JS typed arrays -Xtyped-arrays Translate primitive arrays to JS typed arrays
-Xuse-deprecated-legacy-compiler
Use deprecated legacy compiler without error
-Xwasm Use experimental WebAssembly compiler backend -Xwasm Use experimental WebAssembly compiler backend
-Xwasm-debug-info Add debug info to WebAssembly compiled module -Xwasm-debug-info Add debug info to WebAssembly compiled module
-Xwasm-enable-array-range-checks -Xwasm-enable-array-range-checks
compiler/testData/cli/js/kotlinHomeWithoutStdlib.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/simple2js.kt $TESTDATA_DIR$/simple2js.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-kotlin-home -kotlin-home
$TESTDATA_DIR$ $TESTDATA_DIR$
-output -output
compiler/testData/cli/js/kotlinPackage.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/../kotlinPackage.kt $TESTDATA_DIR$/../kotlinPackage.kt
-no-stdlib -no-stdlib
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-output -output
$TEMP_DIR$/out.js $TEMP_DIR$/out.js
compiler/testData/cli/js/languageVersion.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/languageVersion.kt $TESTDATA_DIR$/languageVersion.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-output -output
$TEMP_DIR$/out.js $TEMP_DIR$/out.js
-language-version -language-version
compiler/testData/cli/js/libraryDirNotFound.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/withLib.kt $TESTDATA_DIR$/withLib.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-libraries -libraries
not/existing/path not/existing/path
-output -output
compiler/testData/cli/js/moduleWithMetadataOnlyDependency.args
Vendored
+2
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/separateModules/sepModule1.kt $TESTDATA_DIR$/separateModules/sepModule1.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-meta-info -meta-info
-Xmetadata-only -Xmetadata-only
-output -output
@@ -7,6 +8,7 @@ $TEMP_DIR$/m1/m1.js
--- ---
$TESTDATA_DIR$/separateModules/sepModule2.kt $TESTDATA_DIR$/separateModules/sepModule2.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-libraries -libraries
$TEMP_DIR$/m1 $TEMP_DIR$/m1
-output -output
compiler/testData/cli/js/modulesWithSameNames.args
Vendored
+2
View File
@@ -1,11 +1,13 @@
$TESTDATA_DIR$/separateModules/sepModule1.kt $TESTDATA_DIR$/separateModules/sepModule1.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-meta-info -meta-info
-output -output
$TEMP_DIR$/m1/m.js $TEMP_DIR$/m1/m.js
--- ---
$TESTDATA_DIR$/separateModules/sepModule2.kt $TESTDATA_DIR$/separateModules/sepModule2.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-libraries -libraries
$TEMP_DIR$/m1 $TEMP_DIR$/m1
-output -output
compiler/testData/cli/js/modulesWithSameNamesAndFunc.args
Vendored
+2
View File
@@ -1,11 +1,13 @@
$TESTDATA_DIR$/separateModules/sepModule3.kt $TESTDATA_DIR$/separateModules/sepModule3.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-meta-info -meta-info
-output -output
$TEMP_DIR$/m3/m.js $TEMP_DIR$/m3/m.js
--- ---
$TESTDATA_DIR$/separateModules/sepModule4.kt $TESTDATA_DIR$/separateModules/sepModule4.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-libraries -libraries
$TEMP_DIR$/m3 $TEMP_DIR$/m3
-output -output
compiler/testData/cli/js/nonExistingSourcePath.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
not/existing/path not/existing/path
-no-stdlib -no-stdlib
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-output -output
$TESTDATA_DIR$ $TESTDATA_DIR$
compiler/testData/cli/js/notValidLibraryDir.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/withLib.kt $TESTDATA_DIR$/withLib.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-libraries -libraries
compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib
-output -output
compiler/testData/cli/js/outputIsDirectory.args
Vendored
+1
View File
@@ -1,4 +1,5 @@
$TESTDATA_DIR$/simple2js.kt $TESTDATA_DIR$/simple2js.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-output -output
$TESTDATA_DIR$ $TESTDATA_DIR$
compiler/testData/cli/js/outputPostfixFileNotFound.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/simple2js.kt $TESTDATA_DIR$/simple2js.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-output -output
$TEMP_DIR$/out.js $TEMP_DIR$/out.js
-output-postfix -output-postfix
compiler/testData/cli/js/outputPrefixFileNotFound.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/simple2js.kt $TESTDATA_DIR$/simple2js.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-output -output
$TEMP_DIR$/out.js $TEMP_DIR$/out.js
-output-prefix -output-prefix
compiler/testData/cli/js/reifiedIntersectionType.args
Vendored
+1
View File
@@ -1,4 +1,5 @@
$TESTDATA_DIR$/reifiedIntersectionType.kt $TESTDATA_DIR$/reifiedIntersectionType.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-output -output
$TEMP_DIR$/out.js $TEMP_DIR$/out.js
compiler/testData/cli/js/simple2js.args
Vendored
+1
View File
@@ -1,4 +1,5 @@
$TESTDATA_DIR$/simple2js.kt $TESTDATA_DIR$/simple2js.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-output -output
$TEMP_DIR$/out.js $TEMP_DIR$/out.js
compiler/testData/cli/js/sourceMap.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/sourceMap.kt $TESTDATA_DIR$/sourceMap.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-source-map -source-map
-source-map-prefix -source-map-prefix
./ ./
compiler/testData/cli/js/sourceMapCharEscape.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/sourceMapCharEscape.kt $TESTDATA_DIR$/sourceMapCharEscape.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-source-map -source-map
-source-map-embed-sources -source-map-embed-sources
always always
compiler/testData/cli/js/sourceMapDuplicateRelativePaths.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/sourceMapDuplicatePath/ $TESTDATA_DIR$/sourceMapDuplicatePath/
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-source-map -source-map
-source-map-base-dirs -source-map-base-dirs
$TESTDATA_DIR$/sourceMapDuplicatePath/foo:$TESTDATA_DIR$/sourceMapDuplicatePath/bar $TESTDATA_DIR$/sourceMapDuplicatePath/foo:$TESTDATA_DIR$/sourceMapDuplicatePath/bar
compiler/testData/cli/js/sourceMapEmbedSources.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/sourceMap.kt $TESTDATA_DIR$/sourceMap.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-source-map -source-map
-source-map-prefix -source-map-prefix
./ ./
compiler/testData/cli/js/sourceMapPrefix.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/sourceMap.kt $TESTDATA_DIR$/sourceMap.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-source-map -source-map
-source-map-prefix -source-map-prefix
/localhost/src/ /localhost/src/
compiler/testData/cli/js/sourceMapRelativeRoot.args
Vendored
+2
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/sourceMapRelativeRoot/lib/src/lib.kt $TESTDATA_DIR$/sourceMapRelativeRoot/lib/src/lib.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-source-map -source-map
-meta-info -meta-info
-output -output
@@ -7,6 +8,7 @@ $TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/lib.js
--- ---
$TESTDATA_DIR$/sourceMapRelativeRoot/main/src/main.kt $TESTDATA_DIR$/sourceMapRelativeRoot/main/src/main.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-libraries -libraries
$TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/ $TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/
-source-map -source-map
compiler/testData/cli/js/sourceMapRootAuto.args
Vendored
+1
View File
@@ -1,6 +1,7 @@
$TESTDATA_DIR$/sourceMapRoot/foo/file1.kt $TESTDATA_DIR$/sourceMapRoot/foo/file1.kt
$TESTDATA_DIR$/sourceMapRoot/bar/file2.kt $TESTDATA_DIR$/sourceMapRoot/bar/file2.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-source-map -source-map
-source-map-prefix -source-map-prefix
./ ./
compiler/testData/cli/js/sourceMapRootManual.args
Vendored
+1
View File
@@ -1,6 +1,7 @@
$TESTDATA_DIR$/sourceMapRoot/foo/file1.kt $TESTDATA_DIR$/sourceMapRoot/foo/file1.kt
$TESTDATA_DIR$/sourceMapRoot/bar/file2.kt $TESTDATA_DIR$/sourceMapRoot/bar/file2.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-source-map -source-map
-source-map-base-dirs -source-map-base-dirs
$TESTDATA_DIR$/ $TESTDATA_DIR$/
compiler/testData/cli/js/sourceMapRootMissing.args
Vendored
+1
View File
@@ -3,6 +3,7 @@ $TESTDATA_DIR$/sourceMapRoot/bar/file2.kt
$TESTDATA_DIR$/sourceMapRoot/bar/baz/file3.kt $TESTDATA_DIR$/sourceMapRoot/bar/baz/file3.kt
$TESTDATA_DIR$/sourceMapRoot/foo/baz/file4.kt $TESTDATA_DIR$/sourceMapRoot/foo/baz/file4.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-source-map -source-map
-source-map-base-dirs -source-map-base-dirs
$TESTDATA_DIR$/sourceMapRoot/foo $TESTDATA_DIR$/sourceMapRoot/foo
compiler/testData/cli/js/sourceMapRootMultiple.args
Vendored
+1
View File
@@ -1,6 +1,7 @@
$TESTDATA_DIR$/sourceMapRoot/foo/file1.kt $TESTDATA_DIR$/sourceMapRoot/foo/file1.kt
$TESTDATA_DIR$/sourceMapRoot/bar/file2.kt $TESTDATA_DIR$/sourceMapRoot/bar/file2.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-source-map -source-map
-source-map-base-dirs -source-map-base-dirs
$TESTDATA_DIR$/foo:$TESTDATA_DIR$/bar $TESTDATA_DIR$/foo:$TESTDATA_DIR$/bar
compiler/testData/cli/js/suppressAllWarningsJS.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/../warnings.kt $TESTDATA_DIR$/../warnings.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-nowarn -nowarn
-output -output
$TEMP_DIR$/out.js $TEMP_DIR$/out.js
compiler/testData/cli/js/withFolderAsLib.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/withLib.kt $TESTDATA_DIR$/withLib.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-libraries -libraries
$TESTDATA_DIR$/folderAsLib $TESTDATA_DIR$/folderAsLib
-output -output
compiler/testData/cli/js/withLib.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/withLib.kt $TESTDATA_DIR$/withLib.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-libraries -libraries
$TESTDATA_DIR$/lib/LibraryExample.jar $TESTDATA_DIR$/lib/LibraryExample.jar
-output -output
compiler/testData/cli/js/wrongAbiVersion.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/simple2js.kt $TESTDATA_DIR$/simple2js.kt
-Xlegacy-deprecated-no-warn -Xlegacy-deprecated-no-warn
-Xuse-deprecated-legacy-compiler
-no-stdlib -no-stdlib
-libraries -libraries
$TESTDATA_DIR$/wrongAbiVersionLib/wrongAbiLib.meta.js $TESTDATA_DIR$/wrongAbiVersionLib/wrongAbiLib.meta.js
compiler/testData/integration/ant/js/additionalArguments/build.log.expected
Vendored
+8 -1
View File
@@ -3,7 +3,14 @@ Buildfile: [TestData]/build.xml
build: build:
[kotlin2js] Compiling [[TestData]/hello.kt] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/hello.kt] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/additionalArguments/build.xml
Vendored
+1
View File
@@ -4,6 +4,7 @@
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/hello.kt" output="${temp}/out.js"> <kotlin2js src="${test.data}/hello.kt" output="${temp}/out.js">
<compilerarg value="-Xno-inline"/> <compilerarg value="-Xno-inline"/>
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js> </kotlin2js>
</target> </target>
</project> </project>
compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.log.expected
Vendored
+8 -1
View File
@@ -3,7 +3,14 @@ Buildfile: [TestData]/build.xml
build: build:
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml
Vendored
+3 -1
View File
@@ -5,6 +5,8 @@
<kotlin2js src="${test.data}/root1" <kotlin2js src="${test.data}/root1"
output="${temp}/out.js" output="${temp}/out.js"
outputPrefix="${test.data}/prefix" outputPrefix="${test.data}/prefix"
outputPostfix="${test.data}/postfix" /> outputPostfix="${test.data}/postfix">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
</target> </target>
</project> </project>
compiler/testData/integration/ant/js/manySources/build.log.expected
Vendored
+8 -1
View File
@@ -3,7 +3,14 @@ Buildfile: [TestData]/build.xml
build: build:
[kotlin2js] Compiling [[TestData]/root1, [TestData]/bar.kt, [TestData]/root2/Foo.kt] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1, [TestData]/bar.kt, [TestData]/root2/Foo.kt] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/manySources/build.xml
Vendored
+1
View File
@@ -9,6 +9,7 @@
<include name="**/*.kt"/> <include name="**/*.kt"/>
</fileset> </fileset>
</src> </src>
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js> </kotlin2js>
</target> </target>
</project> </project>
compiler/testData/integration/ant/js/outputPostfix/build.log.expected
Vendored
+8 -1
View File
@@ -3,7 +3,14 @@ Buildfile: [TestData]/build.xml
build: build:
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/outputPostfix/build.xml
Vendored
+3 -1
View File
@@ -2,6 +2,8 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" outputPostfix="${test.data}/postfix" /> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" outputPostfix="${test.data}/postfix">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
</target> </target>
</project> </project>
compiler/testData/integration/ant/js/outputPrefix/build.log.expected
Vendored
+8 -1
View File
@@ -3,7 +3,14 @@ Buildfile: [TestData]/build.xml
build: build:
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/outputPrefix/build.xml
Vendored
+3 -1
View File
@@ -2,6 +2,8 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" outputPrefix="${test.data}/prefix" /> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" outputPrefix="${test.data}/prefix">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
</target> </target>
</project> </project>
compiler/testData/integration/ant/js/outputWithoutDirectory/build.log.expected
Vendored
+8 -1
View File
@@ -2,7 +2,14 @@ OUT:
Buildfile: [TestData]/build.xml Buildfile: [TestData]/build.xml
build: build:
[java] warning: legacy compiler is deprecated. Please migrate onto IR. [java] warning: ==========
[java] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[java]
[java] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[java] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[java]
[java] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[java] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml
Vendored
+1
View File
@@ -6,6 +6,7 @@
<pathelement location="${kotlin.lib}/kotlin-stdlib.jar"/> <pathelement location="${kotlin.lib}/kotlin-stdlib.jar"/>
</classpath> </classpath>
<arg value="${test.data}/root1/foo.kt"/> <arg value="${test.data}/root1/foo.kt"/>
<arg value="-Xuse-deprecated-legacy-compiler"/>
<arg value="-output"/> <arg value="-output"/>
<arg value="out.js"/> <arg value="out.js"/>
<jvmarg value="-noverify"/> <jvmarg value="-noverify"/>
compiler/testData/integration/ant/js/simple/build.log.expected
Vendored
+8 -1
View File
@@ -3,7 +3,14 @@ Buildfile: [TestData]/build.xml
build: build:
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/simple/build.xml
Vendored
+3 -1
View File
@@ -2,6 +2,8 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
</target> </target>
</project> </project>
compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib/build.log.expected
Vendored
+16 -2
View File
@@ -4,9 +4,23 @@ Buildfile: [TestData]/build.xml
build: build:
[mkdir] Created dir: [Temp]/lib [mkdir] Created dir: [Temp]/lib
[kotlin2js] Compiling [[TestData]/jslib-example] => [[Temp]/lib/jslib-example.js] [kotlin2js] Compiling [[TestData]/jslib-example] => [[Temp]/lib/jslib-example.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[copy] Copying 2 files to [Temp] [copy] Copying 2 files to [Temp]
BUILD SUCCESSFUL BUILD SUCCESSFUL
compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib/build.xml
Vendored
+4 -1
View File
@@ -5,12 +5,15 @@
<target name="build"> <target name="build">
<mkdir dir="${temp.library.path}"/> <mkdir dir="${temp.library.path}"/>
<kotlin2js src="${library.path}" output="${temp.library.path}/jslib-example.js" metaInfo="true"/> <kotlin2js src="${library.path}" output="${temp.library.path}/jslib-example.js" metaInfo="true">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
<libraries> <libraries>
<pathelement path="${temp.library.path}/jslib-example.meta.js"/> <pathelement path="${temp.library.path}/jslib-example.meta.js"/>
</libraries> </libraries>
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js> </kotlin2js>
<copy todir="${temp}"> <copy todir="${temp}">
<fileset dir="${temp.library.path}"> <fileset dir="${temp.library.path}">
compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.log.expected
Vendored
+16 -2
View File
@@ -4,9 +4,23 @@ Buildfile: [TestData]/build.xml
build: build:
[mkdir] Created dir: [Temp]/lib [mkdir] Created dir: [Temp]/lib
[kotlin2js] Compiling [[TestData]/jslib-example] => [[Temp]/lib/jslib-example.js] [kotlin2js] Compiling [[TestData]/jslib-example] => [[Temp]/lib/jslib-example.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[copy] Copying 2 files to [Temp] [copy] Copying 2 files to [Temp]
[copy] Copying 1 file to [Temp] [copy] Copying 1 file to [Temp]
compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.xml
Vendored
+4 -1
View File
@@ -5,12 +5,15 @@
<target name="build"> <target name="build">
<mkdir dir="${temp.library.path}"/> <mkdir dir="${temp.library.path}"/>
<kotlin2js src="${library.path}" output="${temp.library.path}/jslib-example.js" metaInfo="true" moduleKind="umd"/> <kotlin2js src="${library.path}" output="${temp.library.path}/jslib-example.js" metaInfo="true" moduleKind="umd">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call" moduleKind="amd"> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call" moduleKind="amd">
<libraries> <libraries>
<pathelement path="${temp.library.path}/jslib-example.meta.js"/> <pathelement path="${temp.library.path}/jslib-example.meta.js"/>
</libraries> </libraries>
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js> </kotlin2js>
<copy todir="${temp}"> <copy todir="${temp}">
<fileset dir="${temp.library.path}"> <fileset dir="${temp.library.path}">
compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.log.expected
Vendored
+24 -3
View File
@@ -4,15 +4,36 @@ Buildfile: [TestData]/build.xml
build: build:
[mkdir] Created dir: [Temp]/lib [mkdir] Created dir: [Temp]/lib
[kotlin2js] Compiling [[TestData]/jslib-example1] => [[Temp]/lib/jslib-example1.js] [kotlin2js] Compiling [[TestData]/jslib-example1] => [[Temp]/lib/jslib-example1.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[kotlin2js] Compiling [[TestData]/jslib-example2] => [[Temp]/lib/jslib-example2.js] [kotlin2js] Compiling [[TestData]/jslib-example2] => [[Temp]/lib/jslib-example2.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[delete] Deleting: [Temp]/lib/jslib-example1.js [delete] Deleting: [Temp]/lib/jslib-example1.js
[delete] Deleting: [Temp]/lib/jslib-example2.js [delete] Deleting: [Temp]/lib/jslib-example2.js
[delete] Deleting: [Temp]/lib/jslib-example1.meta.js [delete] Deleting: [Temp]/lib/jslib-example1.meta.js
[delete] Deleting: [Temp]/lib/jslib-example2.meta.js [delete] Deleting: [Temp]/lib/jslib-example2.meta.js
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[copy] Copying 1 file to [Temp] [copy] Copying 1 file to [Temp]
BUILD SUCCESSFUL BUILD SUCCESSFUL
compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.xml
Vendored
+5 -1
View File
@@ -6,11 +6,14 @@
<target name="build"> <target name="build">
<mkdir dir="${temp.library.path}"/> <mkdir dir="${temp.library.path}"/>
<kotlin2js src="${library.path1}" output="${temp.library.path}/jslib-example1.js" metaInfo="true"/> <kotlin2js src="${library.path1}" output="${temp.library.path}/jslib-example1.js" metaInfo="true">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
<kotlin2js src="${library.path2}" output="${temp.library.path}/jslib-example2.js" metaInfo="true"> <kotlin2js src="${library.path2}" output="${temp.library.path}/jslib-example2.js" metaInfo="true">
<libraries> <libraries>
<pathelement path="${temp.library.path}/jslib-example1.meta.js"/> <pathelement path="${temp.library.path}/jslib-example1.meta.js"/>
</libraries> </libraries>
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js> </kotlin2js>
<concat destfile="${temp.library.path}/jslib-example.js"> <concat destfile="${temp.library.path}/jslib-example.js">
@@ -29,6 +32,7 @@
<libraries> <libraries>
<pathelement path="${temp.library.path}/jslib-example.js"/> <pathelement path="${temp.library.path}/jslib-example.js"/>
</libraries> </libraries>
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js> </kotlin2js>
<copy todir="${temp}"> <copy todir="${temp}">
<fileset dir="${temp.library.path}"> <fileset dir="${temp.library.path}">
compiler/testData/integration/ant/js/simpleWithMain/build.log.expected
Vendored
+8 -1
View File
@@ -3,7 +3,14 @@ Buildfile: [TestData]/build.xml
build: build:
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/simpleWithMain/build.xml
Vendored
+3 -1
View File
@@ -2,6 +2,8 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
</target> </target>
</project> </project>
compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.log.expected
Vendored
+8 -1
View File
@@ -3,7 +3,14 @@ Buildfile: [TestData]/build.xml
build: build:
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml
Vendored
+3 -1
View File
@@ -2,6 +2,8 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
</target> </target>
</project> </project>
compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.log.expected
Vendored
+24 -3
View File
@@ -4,11 +4,32 @@ Buildfile: [TestData]/build.xml
build: build:
[mkdir] Created dir: [Temp]/lib [mkdir] Created dir: [Temp]/lib
[kotlin2js] Compiling [[TestData]/jslib-example1] => [[Temp]/lib/jslib-example1.js] [kotlin2js] Compiling [[TestData]/jslib-example1] => [[Temp]/lib/jslib-example1.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[kotlin2js] Compiling [[TestData]/jslib-example2] => [[Temp]/lib/jslib-example2.js] [kotlin2js] Compiling [[TestData]/jslib-example2] => [[Temp]/lib/jslib-example2.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[copy] Copying 4 files to [Temp] [copy] Copying 4 files to [Temp]
BUILD SUCCESSFUL BUILD SUCCESSFUL
compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.xml
Vendored
+5 -1
View File
@@ -6,11 +6,14 @@
<target name="build"> <target name="build">
<mkdir dir="${temp.library.path}"/> <mkdir dir="${temp.library.path}"/>
<kotlin2js src="${library.path1}" output="${temp.library.path}/jslib-example1.js" metaInfo="true"/> <kotlin2js src="${library.path1}" output="${temp.library.path}/jslib-example1.js" metaInfo="true">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
<kotlin2js src="${library.path2}" output="${temp.library.path}/jslib-example2.js" metaInfo="true"> <kotlin2js src="${library.path2}" output="${temp.library.path}/jslib-example2.js" metaInfo="true">
<libraries> <libraries>
<pathelement path="${temp.library.path}/jslib-example1.meta.js"/> <pathelement path="${temp.library.path}/jslib-example1.meta.js"/>
</libraries> </libraries>
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js> </kotlin2js>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
@@ -18,6 +21,7 @@
<pathelement path="${temp.library.path}/jslib-example1.meta.js"/> <pathelement path="${temp.library.path}/jslib-example1.meta.js"/>
<pathelement path="${temp.library.path}/jslib-example2.meta.js"/> <pathelement path="${temp.library.path}/jslib-example2.meta.js"/>
</libraries> </libraries>
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js> </kotlin2js>
<copy todir="${temp}"> <copy todir="${temp}">
<fileset dir="${temp.library.path}"> <fileset dir="${temp.library.path}">
compiler/testData/integration/ant/js/simpleWithVarargMain/build.log.expected
Vendored
+8 -1
View File
@@ -3,7 +3,14 @@ Buildfile: [TestData]/build.xml
build: build:
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml
Vendored
+3 -1
View File
@@ -2,6 +2,8 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
</target> </target>
</project> </project>
compiler/testData/integration/ant/js/simpleWithoutStdlib/build.log.expected
Vendored
+8 -1
View File
@@ -3,7 +3,14 @@ Buildfile: [TestData]/build.xml
build: build:
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/simpleWithoutStdlib/build.xml
Vendored
+3 -1
View File
@@ -2,6 +2,8 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js"/> <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
</target> </target>
</project> </project>
compiler/testData/integration/ant/js/simpleWithoutStdlibAndFolderAsAnotherLib/build.log.expected
Vendored
+16 -2
View File
@@ -4,9 +4,23 @@ Buildfile: [TestData]/build.xml
build: build:
[mkdir] Created dir: [Temp]/lib [mkdir] Created dir: [Temp]/lib
[kotlin2js] Compiling [[TestData]/jslib-example] => [[Temp]/lib/jslib-example.js] [kotlin2js] Compiling [[TestData]/jslib-example] => [[Temp]/lib/jslib-example.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[copy] Copying 2 files to [Temp] [copy] Copying 2 files to [Temp]
BUILD SUCCESSFUL BUILD SUCCESSFUL
compiler/testData/integration/ant/js/simpleWithoutStdlibAndFolderAsAnotherLib/build.xml
Vendored
+4 -1
View File
@@ -5,12 +5,15 @@
<target name="build"> <target name="build">
<mkdir dir="${temp.library.path}"/> <mkdir dir="${temp.library.path}"/>
<kotlin2js src="${library.path}" noStdlib="true" output="${temp.library.path}/jslib-example.js" metaInfo="true"/> <kotlin2js src="${library.path}" noStdlib="true" output="${temp.library.path}/jslib-example.js" metaInfo="true">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"> <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call">
<libraries> <libraries>
<pathelement path="${temp.library.path}"/> <pathelement path="${temp.library.path}"/>
</libraries> </libraries>
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js> </kotlin2js>
<copy todir="${temp}"> <copy todir="${temp}">
<fileset dir="${temp.library.path}"> <fileset dir="${temp.library.path}">
compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/build.log.expected
Vendored
+16 -2
View File
@@ -4,9 +4,23 @@ Buildfile: [TestData]/build.xml
build: build:
[mkdir] Created dir: [Temp]/lib [mkdir] Created dir: [Temp]/lib
[kotlin2js] Compiling [[TestData]/jslib-example] => [[Temp]/lib/jslib-example.js] [kotlin2js] Compiling [[TestData]/jslib-example] => [[Temp]/lib/jslib-example.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
[copy] Copying 2 files to [Temp] [copy] Copying 2 files to [Temp]
BUILD SUCCESSFUL BUILD SUCCESSFUL
compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/build.xml
Vendored
+4 -1
View File
@@ -5,12 +5,15 @@
<target name="build"> <target name="build">
<mkdir dir="${temp.library.path}"/> <mkdir dir="${temp.library.path}"/>
<kotlin2js src="${library.path}" noStdlib="true" output="${temp.library.path}/jslib-example.js" metaInfo="true"/> <kotlin2js src="${library.path}" noStdlib="true" output="${temp.library.path}/jslib-example.js" metaInfo="true">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"> <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call">
<libraries> <libraries>
<pathelement path="${temp.library.path}/jslib-example.meta.js"/> <pathelement path="${temp.library.path}/jslib-example.meta.js"/>
</libraries> </libraries>
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js> </kotlin2js>
<copy todir="${temp}"> <copy todir="${temp}">
<fileset dir="${temp.library.path}"> <fileset dir="${temp.library.path}">
compiler/testData/integration/ant/js/sourceMap/build.log.expected
Vendored
+8 -1
View File
@@ -3,7 +3,14 @@ Buildfile: [TestData]/build.xml
build: build:
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/sourceMap/build.xml
Vendored
+3 -1
View File
@@ -2,6 +2,8 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" sourcemap="true"/> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" sourcemap="true">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
</target> </target>
</project> </project>
compiler/testData/integration/ant/js/suppressWarnings/build.log.expected
Vendored
+8 -1
View File
@@ -3,7 +3,14 @@ Buildfile: [TestData]/build.xml
build: build:
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/suppressWarnings/build.xml
Vendored
+3 -1
View File
@@ -2,6 +2,8 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" nowarn="true"/> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" nowarn="true">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
</target> </target>
</project> </project>
compiler/testData/integration/ant/js/verbose/build.log.expected
Vendored
+8 -1
View File
@@ -6,7 +6,14 @@ build:
[kotlin2js] logging: using Kotlin home directory [KotlinProjectHome]/dist/kotlinc [kotlin2js] logging: using Kotlin home directory [KotlinProjectHome]/dist/kotlinc
[kotlin2js] logging: exception on loading scripting plugin: java.lang.ClassNotFoundException: org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingCompilerConfigurationComponentRegistrar [kotlin2js] logging: exception on loading scripting plugin: java.lang.ClassNotFoundException: org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingCompilerConfigurationComponentRegistrar
[kotlin2js] logging: compiling source files: [TestData]/root1/foo.kt [kotlin2js] logging: compiling source files: [TestData]/root1/foo.kt
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/verbose/build.xml
Vendored
+3 -1
View File
@@ -2,6 +2,8 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" verbose="true"/> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" verbose="true">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
</target> </target>
</project> </project>
compiler/testData/integration/ant/js/version/build.log.expected
Vendored
+8 -1
View File
@@ -4,7 +4,14 @@ Buildfile: [TestData]/build.xml
build: build:
[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
[kotlin2js] info: kotlinc-js [KotlinVersion] (JRE [JREVersion]) [kotlin2js] info: kotlinc-js [KotlinVersion] (JRE [JREVersion])
[kotlin2js] warning: legacy compiler is deprecated. Please migrate onto IR. [kotlin2js] warning: ==========
[kotlin2js] This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
[kotlin2js]
[kotlin2js] Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
[kotlin2js] Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
[kotlin2js]
[kotlin2js] You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
[kotlin2js] ==========
BUILD SUCCESSFUL BUILD SUCCESSFUL
Total time: [time] Total time: [time]
compiler/testData/integration/ant/js/version/build.xml
Vendored
+3 -1
View File
@@ -2,6 +2,8 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" printVersion="true"/> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" printVersion="true">
<compilerarg value="-Xuse-deprecated-legacy-compiler"/>
</kotlin2js>
</target> </target>
</project> </project>
compiler/testData/multiplatform/contracts/output.txt
Vendored
+8 -1
View File
@@ -9,4 +9,11 @@ Output:
-- JS -- -- JS --
Exit code: OK Exit code: OK
Output: Output:
warning: legacy compiler is deprecated. Please migrate onto IR. warning: ==========
This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
==========
compiler/testData/multiplatform/funInterfaces/output.txt
Vendored
+8 -1
View File
@@ -9,4 +9,11 @@ Output:
-- JS -- -- JS --
Exit code: OK Exit code: OK
Output: Output:
warning: legacy compiler is deprecated. Please migrate onto IR. warning: ==========
This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
==========
compiler/testData/multiplatform/inlineClasses/output.txt
Vendored
+8 -1
View File
@@ -21,7 +21,14 @@ actual class Foo2 actual constructor(actual val y: String)
-- JS -- -- JS --
Exit code: COMPILATION_ERROR Exit code: COMPILATION_ERROR
Output: Output:
warning: legacy compiler is deprecated. Please migrate onto IR. warning: ==========
This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
==========
compiler/testData/multiplatform/inlineClasses/js.kt:5:1: error: actual class 'Foo2' has no corresponding expected declaration compiler/testData/multiplatform/inlineClasses/js.kt:5:1: error: actual class 'Foo2' has no corresponding expected declaration
The following declaration is incompatible because modifiers are different (companion, inner, inline): The following declaration is incompatible because modifiers are different (companion, inner, inline):
public final expect inline class Foo2 public final expect inline class Foo2
compiler/testData/multiplatform/jsNameClash/output.txt
Vendored
+8 -1
View File
@@ -5,4 +5,11 @@ Output:
-- JS -- -- JS --
Exit code: OK Exit code: OK
Output: Output:
warning: legacy compiler is deprecated. Please migrate onto IR. warning: ==========
This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
==========
compiler/testData/multiplatform/optionalExpectation/output.txt
Vendored
+8 -1
View File
@@ -9,4 +9,11 @@ Output:
-- JS -- -- JS --
Exit code: OK Exit code: OK
Output: Output:
warning: legacy compiler is deprecated. Please migrate onto IR. warning: ==========
This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
==========
compiler/testData/multiplatform/simple/output.txt
Vendored
+8 -1
View File
@@ -9,4 +9,11 @@ Output:
-- JS -- -- JS --
Exit code: OK Exit code: OK
Output: Output:
warning: legacy compiler is deprecated. Please migrate onto IR. warning: ==========
This project currently uses the Kotlin/JS Legacy compiler backend, which has been deprecated and will be removed in a future release.
Please migrate your project to the new IR-based compiler (https://kotl.in/jsir).
Because your build tool will not support the new Kotlin/JS compiler, you will also need to migrate to Gradle.
You can continue to use the deprecated legacy compiler in the current version of the toolchain by providing the compiler option -Xuse-deprecated-legacy-compiler.
==========
compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractKotlinCompilerIntegrationTest.kt
+1
View File
@@ -163,6 +163,7 @@ abstract class AbstractKotlinCompilerIntegrationTest : TestCaseWithTmpdir() {
args.add(classpath.joinToString(File.pathSeparator)) args.add(classpath.joinToString(File.pathSeparator))
} }
args.add("-Xlegacy-deprecated-no-warn") args.add("-Xlegacy-deprecated-no-warn")
args.add("-Xuse-deprecated-legacy-compiler")
args.add("-output") args.add("-output")
args.add(output.path) args.add(output.path)
args.add("-meta-info") args.add("-meta-info")
compiler/tests/org/jetbrains/kotlin/cli/AnalysisHandlerExtensionTest.kt
+1 -1
View File
@@ -67,7 +67,7 @@ class AnalysisHandlerExtensionTest : TestCaseWithTmpdir() {
val plugin = writePlugin(klass) val plugin = writePlugin(klass)
val args = listOf("-Xplugin=$plugin", mainKt.absolutePath) val args = listOf("-Xplugin=$plugin", mainKt.absolutePath)
val outputPath = if (compiler is K2JSCompiler) val outputPath = if (compiler is K2JSCompiler)
listOf("-output", tmpdir.resolve("out.js").absolutePath) listOf("-Xuse-deprecated-legacy-compiler", "-output", tmpdir.resolve("out.js").absolutePath)
else else
listOf("-d", tmpdir.resolve("out").absolutePath) listOf("-d", tmpdir.resolve("out").absolutePath)
val (output, exitCode) = CompilerTestUtil.executeCompiler(compiler, args + outputPath + extras) val (output, exitCode) = CompilerTestUtil.executeCompiler(compiler, args + outputPath + extras)
compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
+1 -1
View File
@@ -141,7 +141,7 @@ class LauncherScriptTest : TestCaseWithTmpdir() {
runProcess( runProcess(
"kotlinc-js", "kotlinc-js",
"$testDataDirectory/emptyMain.kt", "$testDataDirectory/emptyMain.kt",
"-Xlegacy-deprecated-no-warn", "-output", File(tmpdir, "out.js").path "-Xlegacy-deprecated-no-warn", "-Xuse-deprecated-legacy-compiler", "-output", File(tmpdir, "out.js").path
) )
} }
compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
+4 -1
View File
@@ -122,7 +122,10 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration
val result = val result =
when (compiler) { when (compiler) {
is K2JSCompiler -> compileJsLibrary(libraryName, additionalOptions = libraryOptions + "-Xlegacy-deprecated-no-warn") is K2JSCompiler -> compileJsLibrary(
libraryName,
additionalOptions = libraryOptions + "-Xlegacy-deprecated-no-warn" + "-Xuse-deprecated-legacy-compiler"
)
is K2JVMCompiler -> compileLibrary(libraryName, additionalOptions = libraryOptions) is K2JVMCompiler -> compileLibrary(libraryName, additionalOptions = libraryOptions)
else -> throw UnsupportedOperationException(compiler.toString()) else -> throw UnsupportedOperationException(compiler.toString())
} }
compiler/tests/org/jetbrains/kotlin/multiplatform/AbstractMultiPlatformIntegrationTest.kt
+1 -1
View File
@@ -65,7 +65,7 @@ abstract class AbstractMultiPlatformIntegrationTest : KtUsefulTestCase() {
if (jsSrc != null) { if (jsSrc != null) {
appendLine() appendLine()
appendLine("-- JS --") appendLine("-- JS --")
appendLine(K2JSCompiler().compile(jsSrc, commonSrc, "-output", jsDest!!)) appendLine(K2JSCompiler().compile(jsSrc, commonSrc, "-Xuse-deprecated-legacy-compiler", "-output", jsDest!!))
} }
if (common2Src != null) { if (common2Src != null) {
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/GenerateJpsPluginTests.kt
-4
View File
@@ -32,10 +32,6 @@ fun main(args: Array<String>) {
) )
} }
testClass<AbstractIncrementalJsJpsTest> {
model("incremental/multiModule/common", extension = null, excludeParentDirs = true)
}
testClass<AbstractMultiplatformJpsTestWithGeneratedContent> { testClass<AbstractMultiplatformJpsTestWithGeneratedContent> {
model( model(
"incremental/multiModule/multiplatform/withGeneratedContent", extension = null, excludeParentDirs = true, "incremental/multiModule/multiplatform/withGeneratedContent", extension = null, excludeParentDirs = true,
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJsJpsTest.kt
-40
View File
@@ -1,40 +0,0 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.jps.build
import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
import org.jetbrains.kotlin.config.KotlinFacetSettings
import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder
import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder.Companion.JS_JPS_LOG
import org.jetbrains.kotlin.jps.model.JpsKotlinFacetModuleExtension
import org.jetbrains.kotlin.platform.js.JsPlatforms
import java.io.File
abstract class AbstractIncrementalJsJpsTest : AbstractIncrementalJpsTest() {
override val buildLogFinder: BuildLogFinder
get() = super.buildLogFinder.copy(isJsEnabled = true)
override fun doTest(testDataPath: String) {
val buildLogFile = File(testDataPath).resolve(JS_JPS_LOG)
if (!buildLogFile.exists()) {
buildLogFile.writeText("JPS JS LOG PLACEHOLDER")
}
super.doTest(testDataPath)
}
override fun overrideModuleSettings() {
myProject.modules.forEach {
val facet = KotlinFacetSettings()
facet.compilerArguments = K2JSCompilerArguments()
facet.targetPlatform = JsPlatforms.defaultJsPlatform
it.container.setChild(
JpsKotlinFacetModuleExtension.KIND,
JpsKotlinFacetModuleExtension(facet)
)
}
}
}
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
+1
View File
@@ -167,6 +167,7 @@ abstract class AbstractJsLookupTrackerTest : AbstractLookupTrackerTest() {
libraries = libPaths.joinToString(File.pathSeparator) libraries = libPaths.joinToString(File.pathSeparator)
reportOutputFiles = true reportOutputFiles = true
freeArgs = filesToCompile.map { it.canonicalPath } freeArgs = filesToCompile.map { it.canonicalPath }
useDeprecatedLegacyCompiler = true
} }
configureAdditionalArgs(args) configureAdditionalArgs(args)
return runJSCompiler(args, env) return runJSCompiler(args, env)
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java
Generated
-463
View File
@@ -1,463 +0,0 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.jps.build;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File;
import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.jps.GenerateJpsPluginTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInCommon() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, true);
}
@TestMetadata("classAdded")
public void testClassAdded() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/classAdded/");
}
@TestMetadata("classRemoved")
public void testClassRemoved() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/");
}
@TestMetadata("constantValueChanged")
public void testConstantValueChanged() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/");
}
@TestMetadata("copyFileToAnotherModule")
public void testCopyFileToAnotherModule() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/");
}
@TestMetadata("defaultArgumentInConstructorRemoved")
public void testDefaultArgumentInConstructorRemoved() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/");
}
@TestMetadata("defaultParameterAdded")
public void testDefaultParameterAdded() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/");
}
@TestMetadata("defaultParameterAddedForTopLevelFun")
public void testDefaultParameterAddedForTopLevelFun() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/");
}
@TestMetadata("defaultParameterRemoved")
public void testDefaultParameterRemoved() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/");
}
@TestMetadata("defaultParameterRemovedForTopLevelFun")
public void testDefaultParameterRemovedForTopLevelFun() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/");
}
@TestMetadata("defaultValueInConstructorRemoved")
public void testDefaultValueInConstructorRemoved() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/");
}
@TestMetadata("duplicatedClass")
public void testDuplicatedClass() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/");
}
@TestMetadata("exportedDependency")
public void testExportedDependency() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/");
}
@TestMetadata("functionFromDifferentPackageChanged")
public void testFunctionFromDifferentPackageChanged() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/");
}
@TestMetadata("inlineFunctionInlined")
public void testInlineFunctionInlined() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/");
}
@TestMetadata("inlineFunctionTwoPackageParts")
public void testInlineFunctionTwoPackageParts() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/");
}
@TestMetadata("moveFileToAnotherModule")
public void testMoveFileToAnotherModule() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/");
}
@TestMetadata("simple")
public void testSimple() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/simple/");
}
@TestMetadata("simpleDependency")
public void testSimpleDependency() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/");
}
@TestMetadata("simpleDependencyErrorOnAccessToInternal1")
public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/");
}
@TestMetadata("simpleDependencyErrorOnAccessToInternal2")
public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/");
}
@TestMetadata("simpleDependencyUnchanged")
public void testSimpleDependencyUnchanged() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/");
}
@TestMetadata("transitiveDependency")
public void testTransitiveDependency() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/");
}
@TestMetadata("transitiveInlining")
public void testTransitiveInlining() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/");
}
@TestMetadata("twoDependants")
public void testTwoDependants() throws Exception {
runTest("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/");
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classAdded")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class ClassAdded extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInClassAdded() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class ClassRemoved extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInClassRemoved() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class ConstantValueChanged extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInConstantValueChanged() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class CopyFileToAnotherModule extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInCopyFileToAnotherModule() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInDefaultArgumentInConstructorRemoved() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class DefaultParameterAdded extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInDefaultParameterAdded() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInDefaultParameterAddedForTopLevelFun() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class DefaultParameterRemoved extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInDefaultParameterRemoved() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInDefaultParameterRemovedForTopLevelFun() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class DefaultValueInConstructorRemoved extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInDefaultValueInConstructorRemoved() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class DuplicatedClass extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInDuplicatedClass() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class ExportedDependency extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInExportedDependency() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class FunctionFromDifferentPackageChanged extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInFunctionFromDifferentPackageChanged() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class InlineFunctionInlined extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInInlineFunctionInlined() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class InlineFunctionTwoPackageParts extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInInlineFunctionTwoPackageParts() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class MoveFileToAnotherModule extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInMoveFileToAnotherModule() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simple")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Simple extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInSimple() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class SimpleDependency extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInSimpleDependency() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal1() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal2() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class SimpleDependencyUnchanged extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInSimpleDependencyUnchanged() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class TransitiveDependency extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInTransitiveDependency() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class TransitiveInlining extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInTransitiveInlining() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class TwoDependants extends AbstractIncrementalJsJpsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInTwoDependants() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
}
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
-143
View File
@@ -78,8 +78,6 @@ import java.util.zip.ZipOutputStream
open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() {
companion object { companion object {
private const val ADDITIONAL_MODULE_NAME = "module2"
private val EXCLUDE_FILES = arrayOf("Excluded.class", "YetAnotherExcluded.class") private val EXCLUDE_FILES = arrayOf("Excluded.class", "YetAnotherExcluded.class")
private val NOTHING = arrayOf<String>() private val NOTHING = arrayOf<String>()
private const val KOTLIN_JS_LIBRARY = "jslib-example" private const val KOTLIN_JS_LIBRARY = "jslib-example"
@@ -119,13 +117,6 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() {
buildAllModules().assertSuccessful() buildAllModules().assertSuccessful()
} }
protected fun doTestWithKotlinJavaScriptLibrary() {
initProject(JS_STDLIB)
createKotlinJavaScriptLibraryArchive()
addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR))
buildAllModules().assertSuccessful()
}
fun testKotlinProject() { fun testKotlinProject() {
doTest() doTest()
@@ -150,14 +141,6 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() {
buildAllModules().assertSuccessful() buildAllModules().assertSuccessful()
} }
fun testKotlinJavaScriptProject() {
initProject(JS_STDLIB)
buildAllModules().assertSuccessful()
checkOutputFilesList()
checkWhen(touch("src/test1.kt"), null, pathsToDelete = k2jsOutput(PROJECT_NAME))
}
private fun k2jsOutput(vararg moduleNames: String): Array<String> { private fun k2jsOutput(vararg moduleNames: String): Array<String> {
val moduleNamesSet = moduleNames.toSet() val moduleNamesSet = moduleNames.toSet()
val list = mutableListOf<String>() val list = mutableListOf<String>()
@@ -177,54 +160,6 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() {
return list.toTypedArray() return list.toTypedArray()
} }
fun testKotlinJavaScriptProjectNewSourceRootTypes() {
initProject(JS_STDLIB)
buildAllModules().assertSuccessful()
checkOutputFilesList()
}
fun testKotlinJavaScriptProjectWithCustomOutputPaths() {
initProject(JS_STDLIB_WITHOUT_FACET)
buildAllModules().assertSuccessful()
checkOutputFilesList(File(workDir, "target"))
}
fun testKotlinJavaScriptProjectWithSourceMap() {
initProject(JS_STDLIB)
buildAllModules().assertSuccessful()
val sourceMapContent = File(getOutputDir(PROJECT_NAME), "$PROJECT_NAME.js.map").readText()
val expectedPath = "prefix-dir/src/pkg/test1.kt"
assertTrue("Source map file should contain relative path ($expectedPath)", sourceMapContent.contains("\"$expectedPath\""))
val librarySourceMapFile = File(getOutputDir(PROJECT_NAME), "lib/kotlin.js.map")
assertTrue("Source map for stdlib should be copied to $librarySourceMapFile", librarySourceMapFile.exists())
}
fun testKotlinJavaScriptProjectWithSourceMapRelativePaths() {
initProject(JS_STDLIB)
buildAllModules().assertSuccessful()
val sourceMapContent = File(getOutputDir(PROJECT_NAME), "$PROJECT_NAME.js.map").readText()
val expectedPath = "../../../src/pkg/test1.kt"
assertTrue("Source map file should contain relative path ($expectedPath)", sourceMapContent.contains("\"$expectedPath\""))
val librarySourceMapFile = File(getOutputDir(PROJECT_NAME), "lib/kotlin.js.map")
assertTrue("Source map for stdlib should be copied to $librarySourceMapFile", librarySourceMapFile.exists())
}
fun testKotlinJavaScriptProjectWithTwoModules() {
initProject(JS_STDLIB)
buildAllModules().assertSuccessful()
checkOutputFilesList()
checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME))
checkWhen(touch("module2/src/module2.kt"), null, k2jsOutput(ADDITIONAL_MODULE_NAME))
checkWhen(arrayOf(touch("src/test1.kt"), touch("module2/src/module2.kt")), null, k2jsOutput(PROJECT_NAME, ADDITIONAL_MODULE_NAME))
}
@WorkingDir("KotlinJavaScriptProjectWithTwoModules") @WorkingDir("KotlinJavaScriptProjectWithTwoModules")
fun testKotlinJavaScriptProjectWithTwoModulesAndWithLibrary() { fun testKotlinJavaScriptProjectWithTwoModulesAndWithLibrary() {
initProject() initProject()
@@ -234,84 +169,6 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() {
buildAllModules().assertSuccessful() buildAllModules().assertSuccessful()
} }
fun testKotlinJavaScriptProjectWithDirectoryAsStdlib() {
initProject()
setupKotlinJSFacet()
val jslibJar = PathUtil.kotlinPathsForDistDirectoryForTests.jsStdLibJarPath
val jslibDir = File(workDir, "KotlinJavaScript")
try {
Decompressor.Zip(jslibJar).extract(jslibDir)
}
catch (ex: IOException) {
throw IllegalStateException(ex.message)
}
addDependency("KotlinJavaScript", jslibDir)
buildAllModules().assertSuccessful()
checkOutputFilesList()
checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME))
}
fun testKotlinJavaScriptProjectWithDirectoryAsLibrary() {
initProject(JS_STDLIB)
addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY))
buildAllModules().assertSuccessful()
checkOutputFilesList()
checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME))
}
fun testKotlinJavaScriptProjectWithLibrary() {
doTestWithKotlinJavaScriptLibrary()
checkOutputFilesList()
checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME))
}
fun testKotlinJavaScriptProjectWithLibraryCustomOutputDir() {
doTestWithKotlinJavaScriptLibrary()
checkOutputFilesList()
checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME))
}
fun testKotlinJavaScriptProjectWithLibraryNoCopy() {
doTestWithKotlinJavaScriptLibrary()
checkOutputFilesList()
checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME))
}
fun testKotlinJavaScriptProjectWithLibraryAndErrors() {
initProject(JS_STDLIB)
createKotlinJavaScriptLibraryArchive()
addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR))
buildAllModules().assertFailed()
checkOutputFilesList()
}
fun testKotlinJavaScriptProjectWithEmptyDependencies() {
initProject(JS_STDLIB)
buildAllModules().assertSuccessful()
}
fun testKotlinJavaScriptInternalFromSpecialRelatedModule() {
initProject(JS_STDLIB)
buildAllModules().assertSuccessful()
}
fun testKotlinJavaScriptProjectWithTests() {
initProject(JS_STDLIB)
buildAllModules().assertSuccessful()
}
fun testKotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies() {
initProject(JS_STDLIB)
buildAllModules().assertSuccessful()
}
fun testExcludeFolderInSourceRoot() { fun testExcludeFolderInSourceRoot() {
doTest() doTest()
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt
+3 -1
View File
@@ -89,7 +89,9 @@ abstract class KotlinJpsBuildTestBase : AbstractKotlinJpsBuildTestCase() {
protected fun setupKotlinJSFacet() { protected fun setupKotlinJSFacet() {
myProject.modules.forEach { myProject.modules.forEach {
val facet = KotlinFacetSettings() val facet = KotlinFacetSettings()
facet.compilerArguments = K2JSCompilerArguments() facet.compilerArguments = K2JSCompilerArguments().apply {
useDeprecatedLegacyCompiler = true
}
facet.targetPlatform = JsPlatforms.defaultJsPlatform facet.targetPlatform = JsPlatforms.defaultJsPlatform
it.container.setChild( it.container.setChild(
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt
-11
View File
@@ -43,17 +43,6 @@ class KotlinJpsBuildTestIncremental : KotlinJpsBuildTest() {
).run() ).run()
} }
fun testKotlinJavaScriptChangePackage() {
initProject(LibraryDependency.JS_STDLIB)
buildAllModules().assertSuccessful()
val class2Kt = File(workDir, "src/Class2.kt")
val newClass2KtContent = class2Kt.readText().replace("package2", "package1")
change(class2Kt.path, newClass2KtContent)
buildAllModules().assertSuccessful()
checkOutputFilesList(File(workDir, "out/production"))
}
fun testJpsDaemonIC() { fun testJpsDaemonIC() {
fun testImpl() { fun testImpl() {
assertTrue("Daemon was not enabled!", isDaemonEnabled()) assertTrue("Daemon was not enabled!", isDaemonEnabled())
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt
+4 -1
View File
@@ -262,7 +262,10 @@ class ModulesTxtBuilder {
"jvm" -> settings.compilerArguments = "jvm" -> settings.compilerArguments =
K2JVMCompilerArguments().also { settings.targetPlatform = JvmPlatforms.defaultJvmPlatform } K2JVMCompilerArguments().also { settings.targetPlatform = JvmPlatforms.defaultJvmPlatform }
"js" -> settings.compilerArguments = "js" -> settings.compilerArguments =
K2JSCompilerArguments().also { settings.targetPlatform = JsPlatforms.defaultJsPlatform } K2JSCompilerArguments().also {
settings.targetPlatform = JsPlatforms.defaultJsPlatform
it.useDeprecatedLegacyCompiler = true
}
"native" -> settings.compilerArguments = "native" -> settings.compilerArguments =
FakeK2NativeCompilerArguments().also { settings.targetPlatform = NativePlatforms.unspecifiedNativePlatform } FakeK2NativeCompilerArguments().also { settings.targetPlatform = NativePlatforms.unspecifiedNativePlatform }
else -> { else -> {
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt
+1
View File
@@ -50,6 +50,7 @@ abstract class AbstractJsProtoComparisonTest : AbstractProtoComparisonTest<Proto
metaInfo = true metaInfo = true
main = K2JsArgumentConstants.NO_CALL main = K2JsArgumentConstants.NO_CALL
freeArgs = ktFiles freeArgs = ktFiles
useDeprecatedLegacyCompiler = true
} }
val env = createTestingCompilerEnvironment(messageCollector, outputItemsCollector, services) val env = createTestingCompilerEnvironment(messageCollector, outputItemsCollector, services)
libraries/examples/browser-example-with-library/pom.xml
+5
View File
@@ -70,6 +70,11 @@
<goals> <goals>
<goal>js</goal> <goal>js</goal>
</goals> </goals>
<configuration>
<args>
<arg>-Xuse-deprecated-legacy-compiler</arg>
</args>
</configuration>
</execution> </execution>
<execution> <execution>
<id>test-compile</id> <id>test-compile</id>
libraries/examples/browser-example/pom.xml
+5
View File
@@ -65,6 +65,11 @@
<goals> <goals>
<goal>js</goal> <goal>js</goal>
</goals> </goals>
<configuration>
<args>
<arg>-Xuse-deprecated-legacy-compiler</arg>
</args>
</configuration>
</execution> </execution>
<execution> <execution>
<id>test-compile</id> <id>test-compile</id>

Some files were not shown because too many files have changed in this diff Show More