Delete kotlin-jdk-annotations and kotlin-android-sdk-annotations

They were empty anyway for a long time
HemingChiu · Jan 28, 2016 · 7e17482 · 7e17482
1 parent 911940d
commit 7e17482
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 156 deletions.
diff --git a/build.xml b/build.xml
@@ -740,30 +740,6 @@
         </jar>
     </target>
 
-    <target name="jdk-annotations">
-        <jar destfile="${kotlin-home}/lib/kotlin-jdk-annotations.jar">
-            <manifest>
-                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
-
-                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.jdk.annotations}"/>
-                <attribute name="Implementation-Version" value="${build.number}"/>
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="android-sdk-annotations">
-        <jar destfile="${kotlin-home}/lib/kotlin-android-sdk-annotations.jar">
-            <manifest>
-                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
-
-                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.android.sdk.annotations}"/>
-                <attribute name="Implementation-Version" value="${build.number}"/>
-            </manifest>
-        </jar>
-    </target>
-
     <macrodef name="new-kotlinc">
         <attribute name="output"/>
         <attribute name="moduleName"/>
@@ -1054,11 +1030,11 @@
             depends="builtins,stdlib,kotlin-test,core,reflection,pack-runtime,pack-runtime-sources,mock-runtime-for-test"/>
 
     <target name="dist"
-            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,kotlin-build-common,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin-js-stdlib,android-compiler-plugin,daemon-client"
+            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,kotlin-build-common,ant-tools,runtime,kotlin-js-stdlib,android-compiler-plugin,daemon-client"
             description="Builds redistributables from sources"/>
 
     <target name="dist-quick"
-            depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler-quick,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin-js-stdlib,android-compiler-plugin"
+            depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler-quick,ant-tools,runtime,kotlin-js-stdlib,android-compiler-plugin"
             description="Builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc"/>
 
     <target name="dist-quick-compiler-only"

diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java
@@ -39,12 +39,6 @@ public interface KotlinPaths {
     @NotNull
     File getRuntimeSourcesPath();
 
-    @NotNull
-    File getJdkAnnotationsPath();
-
-    @NotNull
-    File getAndroidSdkAnnotationsPath();
-
     @NotNull
     File getJsStdLibJarPath();
 

diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java
@@ -64,18 +64,6 @@ public File getRuntimeSourcesPath() {
         return getLibraryFile(PathUtil.KOTLIN_JAVA_RUNTIME_SRC_JAR);
     }
 
-    @Override
-    @NotNull
-    public File getJdkAnnotationsPath() {
-        return getLibraryFile(PathUtil.JDK_ANNOTATIONS_JAR);
-    }
-
-    @NotNull
-    @Override
-    public File getAndroidSdkAnnotationsPath() {
-        return getLibraryFile(PathUtil.ANDROID_SDK_ANNOTATIONS_JAR);
-    }
-
     @Override
     @NotNull
     public File getJsStdLibJarPath() {

diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java
@@ -30,8 +30,6 @@ public class PathUtil {
 
     public static final String JS_LIB_JAR_NAME = "kotlin-jslib.jar";
     public static final String JS_LIB_SRC_JAR_NAME = "kotlin-jslib-sources.jar";
-    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 KOTLIN_JAVA_REFLECT_JAR = "kotlin-reflect.jar";
     public static final String KOTLIN_TEST_JAR = "kotlin-test.jar";

diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt
@@ -57,9 +57,6 @@ class KotlinUpdatePluginComponent : ApplicationComponent {
             requestFullJarUpdate(ideaPluginPaths.jsStdLibJarPath)
             requestFullJarUpdate(ideaPluginPaths.jsStdLibSrcJarPath)
 
-            requestFullJarUpdate(ideaPluginPaths.jdkAnnotationsPath)
-            requestFullJarUpdate(ideaPluginPaths.androidSdkAnnotationsPath)
-
             // Force update indices for files under config directory
             val fileBasedIndex = FileBasedIndex.getInstance()
             fileBasedIndex.requestRebuild(KotlinMetadataVersionIndex.name)

diff --git a/libraries/pom.xml b/libraries/pom.xml
@@ -73,8 +73,6 @@
     <modules>
         <module>tools/kotlin-compiler</module>
         <module>tools/kotlin-compiler-embeddable</module>
-        <module>tools/kotlin-jdk-annotations</module>
-        <module>tools/kotlin-android-sdk-annotations</module>
         <module>tools/kotlin-maven-plugin</module>
 
         <module>tools/runtime</module>

diff --git a/libraries/tools/kotlin-android-sdk-annotations/pom.xml b/libraries/tools/kotlin-android-sdk-annotations/pom.xml
diff --git a/libraries/tools/kotlin-jdk-annotations/pom.xml b/libraries/tools/kotlin-jdk-annotations/pom.xml
diff --git a/resources/kotlinManifest.properties b/resources/kotlinManifest.properties
@@ -20,9 +20,6 @@ manifest.impl.title.kotlin.runner=Kotlin Runner
 
 manifest.impl.title.kotlin.test=Kotlin Testing library
 
-manifest.impl.title.kotlin.jdk.annotations=Kotlin Compiler JDK Annotations
-manifest.impl.title.kotlin.android.sdk.annotations=Kotlin Compiler Android SDK Annotations
-
 manifest.impl.title.kotlin.daemon-client=Kotlin Compile Daemon Client
 
 manifest.impl.title.kotlin.build.common=Kotlin Build Common