From 7e174826980bbc958144aaa73660ca32ff94ba32 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 27 Jan 2016 21:29:58 +0300
Subject: [PATCH] Delete kotlin-jdk-annotations and
 kotlin-android-sdk-annotations

They were empty anyway for a long time
---
 build.xml                                     | 28 +---------
 .../jetbrains/kotlin/utils/KotlinPaths.java   |  6 ---
 .../kotlin/utils/KotlinPathsFromHomeDir.java  | 12 -----
 .../org/jetbrains/kotlin/utils/PathUtil.java  |  2 -
 .../versions/KotlinUpdatePluginComponent.kt   |  3 --
 libraries/pom.xml                             |  2 -
 .../kotlin-android-sdk-annotations/pom.xml    | 51 -------------------
 .../tools/kotlin-jdk-annotations/pom.xml      | 51 -------------------
 resources/kotlinManifest.properties           |  3 --
 9 files changed, 2 insertions(+), 156 deletions(-)
 delete mode 100644 libraries/tools/kotlin-android-sdk-annotations/pom.xml
 delete mode 100644 libraries/tools/kotlin-jdk-annotations/pom.xml

diff --git a/build.xml b/build.xml
index 874a1408c6d..797ceab4479 100644
--- 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
index de731ac7ef8..c671087ce4a 100644
--- 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
index 3b51076ab80..63c0f04f80b 100644
--- 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 class KotlinPathsFromHomeDir implements KotlinPaths {
         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
index 6e103d584f0..a8e99ade2da 100644
--- 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
index c86f00f7cd9..80ff244587c 100644
--- 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
index bb1e4623f36..633e35dae53 100644
--- 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
deleted file mode 100644
index 1cdfd452359..00000000000
--- a/libraries/tools/kotlin-android-sdk-annotations/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <maven-plugin-anno.version>1.4.1</maven-plugin-anno.version>
-        <maven.version>3.0.4</maven.version>
-    </properties>
-
-    <parent>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
-        <version>0.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>kotlin-android-sdk-annotations</artifactId>
-    <packaging>pom</packaging>
-
-    <description>External annotations for Android SDK</description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${kotlin-sdk}/lib/kotlin-android-sdk-annotations.jar</file>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-</project>
diff --git a/libraries/tools/kotlin-jdk-annotations/pom.xml b/libraries/tools/kotlin-jdk-annotations/pom.xml
deleted file mode 100644
index 19f7f361300..00000000000
--- a/libraries/tools/kotlin-jdk-annotations/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <maven-plugin-anno.version>1.4.1</maven-plugin-anno.version>
-        <maven.version>3.0.4</maven.version>
-    </properties>
-
-    <parent>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
-        <version>0.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>kotlin-jdk-annotations</artifactId>
-    <packaging>pom</packaging>
-
-    <description>External annotations for JDK</description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${kotlin-sdk}/lib/kotlin-jdk-annotations.jar</file>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-</project>
diff --git a/resources/kotlinManifest.properties b/resources/kotlinManifest.properties
index 5ffb9065b7e..df2a658599b 100644
--- 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