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

Make jars with JDK/Android SDK annotations empty

Browse Source 
- Compiler use them only for getting parameter names and we are OK to drop it
- IDE plugin can use jdkAnnotations from ideaSDK
This commit is contained in:
Denis Zharkov
2015-06-17 14:19:08 +03:00
parent 8013cbe4ef
commit 80a7f79f12
5 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/jvm/compiler/JdkAnnotationsValidityTest.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class JdkAnnotationsValidityTest extends AbstractSdkAnnotationsValidityTe
@Override
protected List<FqName> getClassesToValidate() throws IOException {
return getAffectedClasses("jar://dependencies/annotations/kotlin-jdk-annotations.jar!/");
return getAffectedClasses("jar://dist/kotlinc/lib/kotlin-jdk-annotations.jar!/");
}
static List<FqName> getAffectedClasses(String rootUrl) {
compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java
+2 -2
View File
@@ -327,7 +327,7 @@ public class JetTestUtils {
@NotNull
public static File getJdkAnnotationsJar() {
File jdkAnnotations = new File(getHomeDirectory(), "dependencies/annotations/kotlin-jdk-annotations.jar");
File jdkAnnotations = new File(getHomeDirectory(), "dist/kotlinc/lib/kotlin-jdk-annotations.jar");
if (!jdkAnnotations.exists()) {
throw new RuntimeException("Kotlin JDK annotations jar not found; please run 'ant dist' to build it");
}
@@ -336,7 +336,7 @@ public class JetTestUtils {
@NotNull
public static File getAndroidSdkAnnotationsJar() {
File androidSdkAnnotations = new File(getHomeDirectory(), "dependencies/annotations/kotlin-android-sdk-annotations.jar");
File androidSdkAnnotations = new File(getHomeDirectory(), "dist/kotlinc/lib/kotlin-android-sdk-annotations.jar");
if (!androidSdkAnnotations.exists()) {
throw new RuntimeException("Kotlin Android SDK annotations jar not found; please run 'ant dist' to build it");
}