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

JPS, Tests: migrate to master

Browse Source
This commit is contained in:
Sergey Rostov
2018-09-13 20:40:21 +03:00
parent 81cf3fbc28
commit 9ae478e4fc
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt
+2 -1
View File
@@ -90,7 +90,8 @@ abstract class AbstractKotlinJpsBuildTestCase : BaseKotlinJpsBuildTestCase() {
modules, modules,
exported, exported,
"kotlin-stdlib", "kotlin-stdlib",
PathUtil.kotlinPathsForDistDirectory.stdlibPath PathUtil.kotlinPathsForDistDirectory.stdlibPath,
File(PathUtil.kotlinPathsForDistDirectory.libPath, "annotations-13.0.jar")
) )
} }
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt
+5 -1
View File
@@ -16,7 +16,11 @@ import java.io.File
enum class KotlinJpsLibrary(val id: String, private vararg val roots: File) { enum class KotlinJpsLibrary(val id: String, private vararg val roots: File) {
MockRuntime("kotlin-mock-runtime", ForTestCompileRuntime.minimalRuntimeJarForTests()), MockRuntime("kotlin-mock-runtime", ForTestCompileRuntime.minimalRuntimeJarForTests()),
JvmStdLib("kotlin-stdlib", PathUtil.kotlinPathsForDistDirectory.stdlibPath), JvmStdLib(
"kotlin-stdlib",
PathUtil.kotlinPathsForDistDirectory.stdlibPath,
File(PathUtil.kotlinPathsForDistDirectory.libPath, "annotations-13.0.jar")
),
JvmTest("kotlin-test", PathUtil.kotlinPathsForDistDirectory.kotlinTestPath), JvmTest("kotlin-test", PathUtil.kotlinPathsForDistDirectory.kotlinTestPath),
JsStdLib("KotlinJavaScript", PathUtil.kotlinPathsForDistDirectory.jsStdLibJarPath), JsStdLib("KotlinJavaScript", PathUtil.kotlinPathsForDistDirectory.jsStdLibJarPath),