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

[JS SCRIPTING] moved the javascript engines to a separate module

Browse Source
This commit is contained in:
Vitaliy.Tikhonov
2019-08-30 13:48:41 +03:00
committed by romanart
parent bf0b4f6878
commit f13e05de7d
8 changed files with 73 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/build.gradle.kts
+18 -12
View File
@@ -35,10 +35,28 @@ dependencies {
testCompile(project(":js:js.translator"))
testCompile(project(":js:js.serializer"))
testCompile(project(":js:js.dce"))
testCompile(project(":js:js.engines"))
testCompile(commonDep("junit:junit"))
testCompile(projectTests(":kotlin-build-common"))
testCompile(projectTests(":generators:test-generator"))
val currentOs = OperatingSystem.current()
val j2v8idString = when {
currentOs.isWindows -> {
val suffix = if (currentOs.toString().endsWith("64")) "_64" else ""
"com.eclipsesource.j2v8:j2v8_win32_x86$suffix:4.6.0"
}
currentOs.isMacOsX -> "com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0"
currentOs.run { isLinux || isUnix } -> "com.eclipsesource.j2v8:j2v8_linux_x86_64:4.8.0"
else -> {
logger.error("unsupported platform $currentOs - can not compile com.eclipsesource.j2v8 dependency")
"j2v8:$currentOs"
}
}
testCompile(j2v8idString)
testRuntime(kotlinStdlib())
testJsRuntime(kotlinStdlib("js"))
testJsRuntime(project(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned
@@ -46,18 +64,6 @@ dependencies {
testRuntime(project(":kotlin-preloader")) // it's required for ant tests
testRuntime(project(":compiler:backend-common"))
testRuntime(commonDep("org.fusesource.jansi", "jansi"))
val currentOs = OperatingSystem.current()
when {
currentOs.isWindows -> {
val suffix = if (currentOs.toString().endsWith("64")) "_64" else ""
testCompile("com.eclipsesource.j2v8:j2v8_win32_x86$suffix:4.6.0")
}
currentOs.isMacOsX -> testCompile("com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0")
currentOs.run { isLinux || isUnix } -> testCompile("com.eclipsesource.j2v8:j2v8_linux_x86_64:4.8.0")
else -> logger.error("unsupported platform $currentOs - can not compile com.eclipsesource.j2v8 dependency")
}
antLauncherJar(commonDep("org.apache.ant", "ant"))
antLauncherJar(toolsJar())