From 1d4ebded45901a51f59473580ab72e943f929a41 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 12 Sep 2018 05:58:32 +0300 Subject: [PATCH] Add annotations-13.0 in classpath of those tests where the annotations from stdlib were used Original commit: 3cc606577ca779a012e28b3ae9d04c6c0c765260 --- .../kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index 32e9fe6fbdc..41ab77d1813 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -88,7 +88,9 @@ public abstract class AbstractKotlinJpsBuildTestCase extends BaseKotlinJpsBuildT } protected static JpsLibrary addKotlinStdlibDependency(@NotNull Collection modules, boolean exported) { - return addDependency(JpsJavaDependencyScope.COMPILE, modules, exported, "kotlin-stdlib", PathUtil.getKotlinPathsForDistDirectory().getStdlibPath()); + return addDependency(JpsJavaDependencyScope.COMPILE, modules, exported, "kotlin-stdlib", + PathUtil.getKotlinPathsForDistDirectory().getStdlibPath(), + new File(PathUtil.getKotlinPathsForDistDirectory().getLibPath(), "annotations-13.0.jar")); } protected JpsLibrary addDependency(@NotNull String libraryName, @NotNull File libraryFile) {