Delete kotlin-jdk-annotations and kotlin-android-sdk-annotations
They were empty anyway for a long time
This commit is contained in:
Alexander Udalov
@@ -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"
|
||||
|
||||
@@ -39,12 +39,6 @@ public interface KotlinPaths {
|
||||
@NotNull
|
||||
File getRuntimeSourcesPath();
|
||||
|
||||
@NotNull
|
||||
File getJdkAnnotationsPath();
|
||||
|
||||
@NotNull
|
||||
File getAndroidSdkAnnotationsPath();
|
||||
|
||||
@NotNull
|
||||
File getJsStdLibJarPath();
|
||||
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user