From 9ae478e4fcc599feaeb3d67659c8dac3a253a5ab Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Thu, 13 Sep 2018 20:40:21 +0300 Subject: [PATCH] JPS, Tests: migrate to master --- .../kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt | 3 ++- .../test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt index 2122a7752de..04f1d587264 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt @@ -90,7 +90,8 @@ abstract class AbstractKotlinJpsBuildTestCase : BaseKotlinJpsBuildTestCase() { modules, exported, "kotlin-stdlib", - PathUtil.kotlinPathsForDistDirectory.stdlibPath + PathUtil.kotlinPathsForDistDirectory.stdlibPath, + File(PathUtil.kotlinPathsForDistDirectory.libPath, "annotations-13.0.jar") ) } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt index feff953410c..a6083c687f9 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt @@ -16,7 +16,11 @@ import java.io.File enum class KotlinJpsLibrary(val id: String, private vararg val roots: File) { 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), JsStdLib("KotlinJavaScript", PathUtil.kotlinPathsForDistDirectory.jsStdLibJarPath),