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

Remove rependency on annotations-ext.jar

Browse Source
This commit is contained in:
Andrey Breslav
2013-11-20 15:19:00 +04:00
parent 70ae245181
commit a7b50d7d06
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java
+1 -1
View File
@@ -66,7 +66,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
File javaFile = new File(javaFileName); File javaFile = new File(javaFileName);
File ktFile = new File(javaFile.getPath().replaceFirst("\\.java$", ".kt")); File ktFile = new File(javaFile.getPath().replaceFirst("\\.java$", ".kt"));
File txtFile = getTxtFile(javaFile.getPath()); File txtFile = getTxtFile(javaFile.getPath());
NamespaceDescriptor kotlinNamespace = analyzeKotlinAndLoadTestNamespace(ktFile, myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS); NamespaceDescriptor kotlinNamespace = analyzeKotlinAndLoadTestNamespace(ktFile, myTestRootDisposable, ConfigurationKind.ALL);
Pair<NamespaceDescriptor, BindingContext> javaNamespaceAndContext = compileJavaAndLoadTestNamespaceAndBindingContextFromBinary( Pair<NamespaceDescriptor, BindingContext> javaNamespaceAndContext = compileJavaAndLoadTestNamespaceAndBindingContextFromBinary(
Arrays.asList(javaFile), tmpdir, myTestRootDisposable, ConfigurationKind.ALL); Arrays.asList(javaFile), tmpdir, myTestRootDisposable, ConfigurationKind.ALL);
checkLoadedNamespaces(txtFile, kotlinNamespace, javaNamespaceAndContext.first, javaNamespaceAndContext.second); checkLoadedNamespaces(txtFile, kotlinNamespace, javaNamespaceAndContext.first, javaNamespaceAndContext.second);
compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java
+1 -2
View File
@@ -119,8 +119,7 @@ public final class LoadDescriptorUtil {
private static void compileJavaWithAnnotationsJar(@NotNull Collection<File> javaFiles, @NotNull File outDir) throws IOException { private static void compileJavaWithAnnotationsJar(@NotNull Collection<File> javaFiles, @NotNull File outDir) throws IOException {
String classPath = "out/production/runtime" + String classPath = "out/production/runtime" +
File.pathSeparator + JetTestUtils.getAnnotationsJar().getPath() + File.pathSeparator + JetTestUtils.getAnnotationsJar().getPath();
File.pathSeparator + JetTestUtils.getAnnotationsExtJar().getPath();
JetTestUtils.compileJavaFiles(javaFiles, Arrays.asList( JetTestUtils.compileJavaFiles(javaFiles, Arrays.asList(
"-classpath", classPath, "-classpath", classPath,
"-sourcepath", "compiler/tests", // for @ExpectLoadError annotation "-sourcepath", "compiler/tests", // for @ExpectLoadError annotation
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java
+1 -1
View File
@@ -43,7 +43,7 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTe
@Override @Override
protected JetCoreEnvironment createEnvironment() { protected JetCoreEnvironment createEnvironment() {
return createEnvironmentWithMockJdk(ConfigurationKind.JDK_AND_ANNOTATIONS); return createEnvironmentWithMockJdk(ConfigurationKind.ALL);
} }
protected void doTestCheckingPrimaryConstructors(String testFileName) throws IOException { protected void doTestCheckingPrimaryConstructors(String testFileName) throws IOException {