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

Add kotlin annotations for android SDK

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-06-06 19:28:18 +04:00
parent 5965904c0f
commit afa3ead160
70 changed files with 17683 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/jet/utils/KotlinPaths.java
+3
View File
@@ -33,6 +33,9 @@ public interface KotlinPaths {
@NotNull
File getJdkAnnotationsPath();
@NotNull
File getAndroidSdkAnnotationsPath();
@NotNull
File getJsLibJsPath();
compiler/util/src/org/jetbrains/jet/utils/KotlinPathsFromHomeDir.java
+6
View File
@@ -52,6 +52,12 @@ public class KotlinPathsFromHomeDir implements KotlinPaths {
return getLibraryFile(PathUtil.JDK_ANNOTATIONS_JAR);
}
@NotNull
@Override
public File getAndroidSdkAnnotationsPath() {
return getLibraryFile(PathUtil.ANDROID_SDK_ANNOTATIONS_JAR);
}
@Override
@NotNull
public File getJsLibJsPath() {
compiler/util/src/org/jetbrains/jet/utils/PathUtil.java
+1
View File
@@ -32,6 +32,7 @@ public class PathUtil {
public static final String JS_LIB_JAR_NAME = "kotlin-jslib.jar";
public static final String JS_LIB_JS_NAME = "kotlinEcma3.js";
public static final String JDK_ANNOTATIONS_JAR = "kotlin-jdk-annotations.jar";
public static final String ANDROID_SDK_ANNOTATIONS_JAR = "kotlin-android-sdk-annotations.jar";
public static final String KOTLIN_JAVA_RUNTIME_JAR = "kotlin-runtime.jar";
public static final String HOME_FOLDER_NAME = "kotlinc";