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

[Gradle, JS] Migrate kotlin-stdlib-js

Browse Source
This commit is contained in:
Ilya Goncharov
2022-07-28 11:50:28 +02:00
committed by teamcity
parent eed994f1fe
commit eeb0520b48
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/integration/JsIrAnalysisHandlerExtensionTest.kt
+5 -2
View File
@@ -65,11 +65,14 @@ class JsIrAnalysisHandlerExtensionTest : TestCaseWithTmpdir() {
writeText(src.content) writeText(src.content)
} }
val plugin = writePlugin() val plugin = writePlugin()
val outputFile = File(outFile)
val args = listOf( val args = listOf(
"-Xplugin=$plugin", "-Xplugin=$plugin",
"-libraries", libs, "-libraries", libs,
"-output", outFile, "-Xir-output-dir", outputFile.parentFile.path,
mainKt.absolutePath) "-Xir-output-name", outputFile.nameWithoutExtension,
mainKt.absolutePath
)
CompilerTestUtil.executeCompilerAssertSuccessful(compiler, args + extras) CompilerTestUtil.executeCompilerAssertSuccessful(compiler, args + extras)
} }
libraries/stdlib/js-v1/build.gradle
+6 -6
View File
@@ -173,20 +173,20 @@ task compileJs(type: NoDebugJavaExec) {
def rootDir = rootDir def rootDir = rootDir
def projectDir = projectDir def projectDir = projectDir
def compileBuiltinsKotlin2JsFiles = compileBuiltinsKotlin2Js.outputs.files def compileBuiltinsKotlin2JsFiles = compileBuiltinsKotlin2Js.destinationDirectory
def compileKotlin2JsFiles = compileKotlin2Js.outputs.files def compileKotlin2JsFiles = compileKotlin2Js.destinationDirectory
doFirst { doFirst {
args = [jsOutputFileName, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path }.sort() + args = [jsOutputFileName, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path }.sort() +
(compileBuiltinsKotlin2JsFiles.collect { it.path }.sort() + (compileBuiltinsKotlin2JsFiles.asFile.get().listFiles().sort() +
compileKotlin2JsFiles.collect { it.path }.sort()).findAll { compileKotlin2JsFiles.asFile.get().listFiles().sort()).findAll {
it.endsWith(".js") && !it.endsWith(".meta.js") it.name.endsWith(".js") && !it.name.endsWith(".meta.js")
} }
} }
classpath = configurations.kotlinCompilerClasspath classpath = configurations.kotlinCompilerClasspath
def sourceMapFile = file(jsOutputMapFileName) def sourceMapFile = file(jsOutputMapFileName)
def jsOutputMetaFile = file(jsOutputMetaFileName) def jsOutputMetaFile = file(jsOutputMetaFileName)
def compileMetaFile = file(compileKotlin2Js.outputFile.path.replaceAll('\\.js$', '.meta.js')) def compileMetaFile = file(compileKotlin2Js.outputFileProperty.map { it.path.replaceAll('\\.js$', '.meta.js') })
def mainJsOutputDir = compileKotlin2Js.destinationDirectory def mainJsOutputDir = compileKotlin2Js.destinationDirectory
doLast { doLast {
ant.replaceregexp( ant.replaceregexp(