Exclude bundled org.jetbrains.annotations from kotlin-runtime. Add a dependency on org.jetbrains:annotations:13.0 instead.

This commit is contained in:
Ilya Gorbunov
2016-12-05 23:47:20 +03:00
parent 2e7456c56e
commit 7a019e80fe
2 changed files with 11 additions and 15 deletions
@@ -1251,17 +1251,3 @@ public final class kotlin/reflect/KVisibility : java/lang/Enum {
public static fun values ()[Lkotlin/reflect/KVisibility;
}
public abstract interface annotation class org/jetbrains/annotations/Mutable : java/lang/annotation/Annotation {
}
public abstract interface annotation class org/jetbrains/annotations/NotNull : java/lang/annotation/Annotation {
public abstract fun value ()Ljava/lang/String;
}
public abstract interface annotation class org/jetbrains/annotations/Nullable : java/lang/annotation/Annotation {
public abstract fun value ()Ljava/lang/String;
}
public abstract interface annotation class org/jetbrains/annotations/ReadOnly : java/lang/annotation/Annotation {
}
+11 -1
View File
@@ -15,6 +15,14 @@
<artifactId>kotlin-runtime</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>13.0</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>target/copied-sources</sourceDirectory>
@@ -42,7 +50,9 @@
<delete dir="${basedir}/target/copied-sources" failonerror="false"/>
<copy todir="${basedir}/target/copied-sources">
<fileset dir="${basedir}/../../../core/builtins/src"/>
<fileset dir="${basedir}/../../../core/runtime.jvm/src"/>
<fileset dir="${basedir}/../../../core/runtime.jvm/src">
<exclude name="org/jetbrains/annotations/**"/>
</fileset>
</copy>
</target>
</configuration>