Add nullability annotations jar to debugger test application compile classpath
This commit is contained in:
+5
@@ -84,6 +84,11 @@ public class ForTestCompileRuntime {
|
|||||||
return assertExists(new File("dist/kotlinc/lib/kotlin-stdlib-js.jar"));
|
return assertExists(new File("dist/kotlinc/lib/kotlin-stdlib-js.jar"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
public static File jetbrainsAnnotationsForTests() {
|
||||||
|
return assertExists(new File("dist/kotlinc/lib/annotations-13.0.jar"));
|
||||||
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public static File jvmAnnotationsForTests() {
|
public static File jvmAnnotationsForTests() {
|
||||||
return assertExists(new File("dist/kotlinc/lib/kotlin-annotations-jvm.jar"));
|
return assertExists(new File("dist/kotlinc/lib/kotlin-annotations-jvm.jar"));
|
||||||
|
|||||||
@@ -252,7 +252,10 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
|
|||||||
MockLibraryUtil.compileKotlin(sourcesDir, outDir, CUSTOM_LIBRARY_JAR.getPath());
|
MockLibraryUtil.compileKotlin(sourcesDir, outDir, CUSTOM_LIBRARY_JAR.getPath());
|
||||||
|
|
||||||
List<String> options =
|
List<String> options =
|
||||||
Arrays.asList("-d", outputDirPath, "-classpath", ForTestCompileRuntime.runtimeJarForTests().getPath(), "-g");
|
Arrays.asList("-d", outputDirPath, "-classpath",
|
||||||
|
ForTestCompileRuntime.runtimeJarForTests().getPath() + File.pathSeparator +
|
||||||
|
ForTestCompileRuntime.jetbrainsAnnotationsForTests().getPath(),
|
||||||
|
"-g");
|
||||||
KotlinTestUtils.compileJavaFiles(findJavaFiles(new File(sourcesDir)), options);
|
KotlinTestUtils.compileJavaFiles(findJavaFiles(new File(sourcesDir)), options);
|
||||||
|
|
||||||
DexLikeBytecodePatchKt.patchDexTests(outDir);
|
DexLikeBytecodePatchKt.patchDexTests(outDir);
|
||||||
|
|||||||
@@ -282,7 +282,10 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
|
|||||||
MockLibraryUtil.compileKotlin(sourcesDir, outDir, CUSTOM_LIBRARY_JAR.getPath());
|
MockLibraryUtil.compileKotlin(sourcesDir, outDir, CUSTOM_LIBRARY_JAR.getPath());
|
||||||
|
|
||||||
List<String> options =
|
List<String> options =
|
||||||
Arrays.asList("-d", outputDirPath, "-classpath", ForTestCompileRuntime.runtimeJarForTests().getPath(), "-g");
|
Arrays.asList("-d", outputDirPath, "-classpath",
|
||||||
|
ForTestCompileRuntime.runtimeJarForTests().getPath() + File.pathSeparator +
|
||||||
|
ForTestCompileRuntime.jetbrainsAnnotationsForTests().getPath(),
|
||||||
|
"-g");
|
||||||
KotlinTestUtils.compileJavaFiles(findJavaFiles(new File(sourcesDir)), options);
|
KotlinTestUtils.compileJavaFiles(findJavaFiles(new File(sourcesDir)), options);
|
||||||
|
|
||||||
DexLikeBytecodePatchKt.patchDexTests(outDir);
|
DexLikeBytecodePatchKt.patchDexTests(outDir);
|
||||||
|
|||||||
Reference in New Issue
Block a user