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

Use JDK 8 in AbstractCompileAgainstKotlin test

Browse Source
This commit is contained in:
baratynskiy
2017-05-04 11:41:11 +03:00
committed by Mikhail Glukhikh
parent 65aac7ae13
commit a815125281
5 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java
+6 -1
View File
@@ -328,6 +328,11 @@ public class KotlinTestUtils {
);
}
@NotNull
public static KotlinCoreEnvironment createEnvironmentWithFullJdkAndIdeaAnnotations(Disposable disposable) {
return createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(disposable, ConfigurationKind.ALL, TestJdkKind.FULL_JDK);
}
@NotNull
public static String getTestDataPathBase() {
return getHomeDirectory() + "/compiler/testData";
@@ -593,7 +598,7 @@ public class KotlinTestUtils {
@Nullable File javaErrorFile
) throws IOException {
if (!ktFiles.isEmpty()) {
KotlinCoreEnvironment environment = createEnvironmentWithMockJdkAndIdeaAnnotations(disposable);
KotlinCoreEnvironment environment = createEnvironmentWithFullJdkAndIdeaAnnotations(disposable);
LoadDescriptorUtil.compileKotlinToDirAndGetModule(ktFiles, outDir, environment);
}
else {