diff --git a/ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt b/ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt index 6738d77a340..66f9b5ccd8e 100644 --- a/ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt +++ b/ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt @@ -23,19 +23,11 @@ import java.io.File.pathSeparator public class Kotlin2JvmTask : KotlinCompilerBaseTask() { override val compilerFqName = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler" - public var externalAnnotations: Path? = null public var includeRuntime: Boolean = true public var moduleName: String? = null private var compileClasspath: Path? = null - public fun createExternalAnnotations(): Path { - if (externalAnnotations == null) { - externalAnnotations = Path(getProject()) - } - return externalAnnotations!!.createPath() - } - public fun setClasspath(classpath: Path) { if (compileClasspath == null) { compileClasspath = classpath @@ -65,11 +57,6 @@ public class Kotlin2JvmTask : KotlinCompilerBaseTask() { args.add(it.list().join(pathSeparator)) } - externalAnnotations?.let { - args.add("-annotations") - args.add(it.list().join(pathSeparator)) - } - if (moduleName == null) { moduleName = defaultModuleName diff --git a/build.xml b/build.xml index 256effa9ebd..cb4b029628c 100644 --- a/build.xml +++ b/build.xml @@ -25,8 +25,6 @@ - - @@ -529,7 +527,7 @@ - + @@ -630,7 +628,7 @@ - + @@ -960,7 +958,7 @@ - + diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java index ee3f4042992..26b1c3809db 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java @@ -28,10 +28,6 @@ public class K2JVMCompilerArguments extends CommonCompilerArguments { @ValueDescription("") public String classpath; - @Argument(value = "annotations", description = "Paths to external annotations") - @ValueDescription("") - public String annotations; - @Argument(value = "include-runtime", description = "Include Kotlin runtime in to resulting .jar") public boolean includeRuntime; @@ -41,9 +37,6 @@ public class K2JVMCompilerArguments extends CommonCompilerArguments { @Argument(value = "no-stdlib", description = "Don't include Kotlin runtime into classpath") public boolean noStdlib; - @Argument(value = "no-jdk-annotations", description = "Don't include JDK external annotations into classpath") - public boolean noJdkAnnotations; - @Argument(value = "module", description = "Path to the module file to compile") @ValueDescription("") public String module; @@ -51,7 +44,7 @@ public class K2JVMCompilerArguments extends CommonCompilerArguments { @Argument(value = "script", description = "Evaluate the script file") public boolean script; - @Argument(value = "kotlin-home", description = "Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery") + @Argument(value = "kotlin-home", description = "Path to Kotlin compiler home directory, used for runtime libraries discovery") @ValueDescription("") public String kotlinHome; diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleBuilder.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleBuilder.kt index 8ffaec65c4d..541de5eb997 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleBuilder.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleBuilder.kt @@ -27,7 +27,6 @@ public class ModuleBuilder( private val sourceFiles = ArrayList() private val classpathRoots = ArrayList() private val javaSourceRoots = ArrayList() - private val annotationsRoots = ArrayList() public fun addSourceFiles(pattern: String) { sourceFiles.add(pattern) @@ -37,10 +36,6 @@ public class ModuleBuilder( classpathRoots.add(name) } - public fun addAnnotationsPathEntry(name: String) { - annotationsRoots.add(name) - } - public fun addJavaSourceRoot(name: String) { javaSourceRoots.add(name) } @@ -49,7 +44,6 @@ public class ModuleBuilder( override fun getJavaSourceRoots(): List = javaSourceRoots override fun getSourceFiles(): List = sourceFiles override fun getClasspathRoots(): List = classpathRoots - override fun getAnnotationsRoots(): List = annotationsRoots override fun getModuleName(): String = name override fun getModuleType(): String = type } diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleXmlParser.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleXmlParser.java index c84ab2f0c5c..5bcc0286f2f 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleXmlParser.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleXmlParser.java @@ -49,7 +49,6 @@ public class ModuleXmlParser { public static final String JAVA_SOURCE_ROOTS = "javaSourceRoots"; public static final String PATH = "path"; public static final String CLASSPATH = "classpath"; - public static final String EXTERNAL_ANNOTATIONS = "externalAnnotations"; @NotNull public static ModuleScriptData parseModuleScript( @@ -58,8 +57,8 @@ public class ModuleXmlParser { ) { FileInputStream stream = null; try { - stream = new FileInputStream(xmlFile); //noinspection IOResourceOpenedButNotSafelyClosed + stream = new FileInputStream(xmlFile); return new ModuleXmlParser(messageCollector).parse(new BufferedInputStream(stream)); } catch (FileNotFoundException e) { @@ -164,10 +163,6 @@ public class ModuleXmlParser { String path = getAttribute(attributes, PATH, qName); moduleBuilder.addClasspathEntry(path); } - else if (EXTERNAL_ANNOTATIONS.equalsIgnoreCase(qName)) { - String path = getAttribute(attributes, PATH, qName); - moduleBuilder.addAnnotationsPathEntry(path); - } else if (JAVA_SOURCE_ROOTS.equalsIgnoreCase(qName)) { String path = getAttribute(attributes, PATH, qName); moduleBuilder.addJavaSourceRoot(path); diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index 50b904edf64..698b4dbc49b 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -190,10 +190,6 @@ public class KotlinToJVMBytecodeCompiler { } for (Module module : chunk) { - for (String annotationsRoot : module.getAnnotationsRoots()) { - configuration.add(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, new File(annotationsRoot)); - } - configuration.add(JVMConfigurationKeys.MODULES, module); } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java index 90c48395c17..c47df29e0d9 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java @@ -29,7 +29,8 @@ public class JVMConfigurationKeys { private JVMConfigurationKeys() { } - public static final CompilerConfigurationKey> ANNOTATIONS_PATH_KEY = CompilerConfigurationKey.create("annotations path"); + public static final CompilerConfigurationKey> ANNOTATIONS_PATH_KEY = + CompilerConfigurationKey.create("external annotations path"); public static final CompilerConfigurationKey> SCRIPT_PARAMETERS = CompilerConfigurationKey.create("script"); diff --git a/compiler/testData/cli/jvm/help.out b/compiler/testData/cli/jvm/help.out index 251552b82c0..5cefe8f0a18 100644 --- a/compiler/testData/cli/jvm/help.out +++ b/compiler/testData/cli/jvm/help.out @@ -2,14 +2,12 @@ Usage: kotlinc-jvm where possible options include: -d Destination for generated class files -classpath (-cp) Paths where to find user class files - -annotations Paths to external annotations -include-runtime Include Kotlin runtime in to resulting .jar -no-jdk Don't include Java runtime into classpath -no-stdlib Don't include Kotlin runtime into classpath - -no-jdk-annotations Don't include JDK external annotations into classpath -module Path to the module file to compile -script Evaluate the script file - -kotlin-home Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery + -kotlin-home Path to Kotlin compiler home directory, used for runtime libraries discovery -module-name Module name -nowarn Generate no warnings -verbose Enable verbose logging output diff --git a/compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.args b/compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.args index a9acdc9d834..afcc21bfe96 100644 --- a/compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.args +++ b/compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.args @@ -1,7 +1,5 @@ $TESTDATA_DIR$/simple.kt -classpath not/existing/path --annotations -yet/another/not/existing/path -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.out b/compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.out index cbac3bcd5d4..08375f369ec 100644 --- a/compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.out +++ b/compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.out @@ -1,3 +1,2 @@ warning: classpath entry points to a non-existent location: not/existing/path -warning: annotations path entry points to a non-existent location: yet/another/not/existing/path OK diff --git a/compiler/testData/cli/jvm/wrongArgument.out b/compiler/testData/cli/jvm/wrongArgument.out index c18093498aa..5ec560ae04c 100644 --- a/compiler/testData/cli/jvm/wrongArgument.out +++ b/compiler/testData/cli/jvm/wrongArgument.out @@ -3,14 +3,12 @@ Usage: kotlinc-jvm where possible options include: -d Destination for generated class files -classpath (-cp) Paths where to find user class files - -annotations Paths to external annotations -include-runtime Include Kotlin runtime in to resulting .jar -no-jdk Don't include Java runtime into classpath -no-stdlib Don't include Kotlin runtime into classpath - -no-jdk-annotations Don't include JDK external annotations into classpath -module Path to the module file to compile -script Evaluate the script file - -kotlin-home Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery + -kotlin-home Path to Kotlin compiler home directory, used for runtime libraries discovery -module-name Module name -nowarn Generate no warnings -verbose Enable verbose logging output diff --git a/compiler/testData/codegen/boxWithStdlib/classes/kt471.kt b/compiler/testData/codegen/boxWithStdlib/classes/kt471.kt index 72c05984f79..de15f28528f 100644 --- a/compiler/testData/codegen/boxWithStdlib/classes/kt471.kt +++ b/compiler/testData/codegen/boxWithStdlib/classes/kt471.kt @@ -50,7 +50,6 @@ fun test6() : Boolean { return true } -// ArrayList without jdk-annotations cannot be used in these tests class MyArrayList() { private var value17: T? = null private var value39: T? = null diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.kt b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.kt deleted file mode 100644 index 147aa66e090..00000000000 --- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.kt +++ /dev/null @@ -1,32 +0,0 @@ -// !CHECK_TYPE - -package kotlin1 - -import java.util.* - -fun main(args : Array) { - val al : ArrayList = ArrayList() - val al1 = ArrayList(1) -// for (x in al1) { -// -// } - val al2 = ArrayList(ArrayList()) - checkSubtype(al) - checkSubtype(al.clear()) - checkSubtype(al.add(1)) - checkSubtype(al.add(0, 1)) - checkSubtype(al.addAll(al1)) - checkSubtype(al.addAll(0, al1)) - checkSubtype(al.get(0)) - val m = HashMap() - m.put("", 1) - test(al, m) -} -fun test(a : List, m : Map) { - System.out.println( - a.get(0) + 1 - ) - HashMap().get(0) - if (m.get("") != null) - System.out.println(m.get("")!!.plus(1)) -} diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.txt b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.txt deleted file mode 100644 index af53ee4dd18..00000000000 --- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.txt +++ /dev/null @@ -1,6 +0,0 @@ -package - -package kotlin1 { - public fun main(/*0*/ args: kotlin.Array): kotlin.Unit - public fun test(/*0*/ a: kotlin.List, /*1*/ m: kotlin.Map): kotlin.Unit -} diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.kt b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.kt deleted file mode 100644 index 2fb96ea1c96..00000000000 --- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.kt +++ /dev/null @@ -1,10 +0,0 @@ -// !CHECK_TYPE - -package kotlin1 - -import java.util.* - -fun main(args : Array) { - val al : ArrayList = ArrayList() - checkSubtype(al.clone()) // A type mismatch on this line means that jdk-annotations were not loaded -} diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.txt b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.txt deleted file mode 100644 index 85a7d75a211..00000000000 --- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.txt +++ /dev/null @@ -1,5 +0,0 @@ -package - -package kotlin1 { - public fun main(/*0*/ args: kotlin.Array): kotlin.Unit -} diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.kt b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.kt deleted file mode 100644 index 4628190c218..00000000000 --- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.kt +++ /dev/null @@ -1,14 +0,0 @@ -// !CHECK_TYPE -// !DIAGNOSTICS: -UNUSED_PARAMETER -package kotlin1 -import java.util.* - -public inline fun Array(n: Int, block: (Int) -> T): Array = null!! - - -fun main(args : Array) { - val al : ArrayList = ArrayList() - - // A type mismatch on this line means that jdk-annotations were not loaded - checkSubtype>(al.toArray(Array(3, {1}))) -} diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.txt b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.txt deleted file mode 100644 index 2a6c099a017..00000000000 --- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.txt +++ /dev/null @@ -1,6 +0,0 @@ -package - -package kotlin1 { - @kotlin.inline() public fun Array(/*0*/ n: kotlin.Int, /*1*/ block: (kotlin.Int) -> T): kotlin.Array - public fun main(/*0*/ args: kotlin.Array): kotlin.Unit -} diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.kt b/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.kt deleted file mode 100644 index 3aad04ed2f6..00000000000 --- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.kt +++ /dev/null @@ -1,34 +0,0 @@ -// !CHECK_TYPE - -import java.sql.DriverManager - -fun getConnection(url: String?) { - DriverManager.getConnection(url) - checkSubtype(DriverManager.getConnection(url!!)) -} - -fun getConnection(url: String?, props: java.util.Properties?) { - DriverManager.getConnection(url, props) - checkSubtype(DriverManager.getConnection(url!!, props)) -} - -fun getConnection(url: String?, user: String?, password: String?) { - DriverManager.getConnection(url, user!!, password!!) - DriverManager.getConnection(url!!, user, password!!) - DriverManager.getConnection(url!!, user!!, password) - checkSubtype(DriverManager.getConnection(url!!, user!!, password!!)) -} - -fun getDriver(url: String?) { - DriverManager.getDriver(url) - checkSubtype(DriverManager.getDriver(url!!)) -} - -fun registerDriver(driver: java.sql.Driver?) { - DriverManager.registerDriver(driver) - DriverManager.registerDriver(driver!!) -} - -fun getDrivers() { - checkSubtype>(DriverManager.getDrivers()) -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.txt b/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.txt deleted file mode 100644 index 86dfdc3b1c8..00000000000 --- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.txt +++ /dev/null @@ -1,8 +0,0 @@ -package - -public fun getConnection(/*0*/ url: kotlin.String?): kotlin.Unit -public fun getConnection(/*0*/ url: kotlin.String?, /*1*/ props: java.util.Properties?): kotlin.Unit -public fun getConnection(/*0*/ url: kotlin.String?, /*1*/ user: kotlin.String?, /*2*/ password: kotlin.String?): kotlin.Unit -public fun getDriver(/*0*/ url: kotlin.String?): kotlin.Unit -public fun getDrivers(): kotlin.Unit -public fun registerDriver(/*0*/ driver: java.sql.Driver?): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.kt b/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.kt deleted file mode 100644 index 6ba9af2eddb..00000000000 --- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.kt +++ /dev/null @@ -1,5 +0,0 @@ -// !CHECK_TYPE - -fun getMetaData(rs: java.sql.ResultSet) { - checkSubtype(rs.getMetaData()) -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.txt b/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.txt deleted file mode 100644 index cd34738bbdd..00000000000 --- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.txt +++ /dev/null @@ -1,3 +0,0 @@ -package - -public fun getMetaData(/*0*/ rs: java.sql.ResultSet): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.kt b/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.kt deleted file mode 100644 index 738d729ecf5..00000000000 --- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.kt +++ /dev/null @@ -1,15 +0,0 @@ -// !CHECK_TYPE - -fun executeQuery(statement: java.sql.Statement, cmd: String?) { - statement.executeQuery(cmd) - checkSubtype(statement.executeQuery(cmd!!)) -} - -fun executeQuery(statement: java.sql.PreparedStatement) { - checkSubtype(statement.executeQuery()) -} - -fun executeUpdate(statement: java.sql.Statement, cmd: String?) { - statement.executeUpdate(cmd) - statement.executeUpdate(cmd!!) -} diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.txt b/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.txt deleted file mode 100644 index 65ddd16c102..00000000000 --- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.txt +++ /dev/null @@ -1,5 +0,0 @@ -package - -public fun executeQuery(/*0*/ statement: java.sql.PreparedStatement): kotlin.Unit -public fun executeQuery(/*0*/ statement: java.sql.Statement, /*1*/ cmd: kotlin.String?): kotlin.Unit -public fun executeUpdate(/*0*/ statement: java.sql.Statement, /*1*/ cmd: kotlin.String?): kotlin.Unit diff --git a/compiler/testData/integration/ant/jvm/externalAnnotations/build.log.expected b/compiler/testData/integration/ant/jvm/externalAnnotations/build.log.expected deleted file mode 100644 index db3f99c32e0..00000000000 --- a/compiler/testData/integration/ant/jvm/externalAnnotations/build.log.expected +++ /dev/null @@ -1,16 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: - [mkdir] Created dir: [Temp]/classes - [javac] Compiling 2 source files to [Temp]/classes - [javac] Compiling [[TestData]/root1] => [[Temp]/classes] - [javac] Running javac... - [jar] Building jar: [Temp]/hello.jar - [java] Hello, a! - [java] Java Hello - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/jvm/externalAnnotations/build.xml b/compiler/testData/integration/ant/jvm/externalAnnotations/build.xml deleted file mode 100644 index db112134871..00000000000 --- a/compiler/testData/integration/ant/jvm/externalAnnotations/build.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/compiler/testData/integration/ant/jvm/externalAnnotations/root1/a/j/annotations.xml b/compiler/testData/integration/ant/jvm/externalAnnotations/root1/a/j/annotations.xml deleted file mode 100644 index 81524f5e075..00000000000 --- a/compiler/testData/integration/ant/jvm/externalAnnotations/root1/a/j/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/compiler/testData/integration/ant/jvm/externalAnnotations/root1/b/j/annotations.xml b/compiler/testData/integration/ant/jvm/externalAnnotations/root1/b/j/annotations.xml deleted file mode 100644 index b2d319ef8aa..00000000000 --- a/compiler/testData/integration/ant/jvm/externalAnnotations/root1/b/j/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/compiler/testData/integration/ant/jvm/externalAnnotations/root1/hello.kt b/compiler/testData/integration/ant/jvm/externalAnnotations/root1/hello.kt deleted file mode 100644 index 97065421b25..00000000000 --- a/compiler/testData/integration/ant/jvm/externalAnnotations/root1/hello.kt +++ /dev/null @@ -1,9 +0,0 @@ -package hello - -fun main(args : Array) { - for (s in arrayListOf("a")) - println("Hello, $s!") - val java: String = j.Java().f() - val hello: String = j.Java().f2() - println("$java $hello") -} diff --git a/compiler/testData/integration/ant/jvm/externalAnnotations/root1/j/Java.java b/compiler/testData/integration/ant/jvm/externalAnnotations/root1/j/Java.java deleted file mode 100644 index ce5f7282990..00000000000 --- a/compiler/testData/integration/ant/jvm/externalAnnotations/root1/j/Java.java +++ /dev/null @@ -1,20 +0,0 @@ -package j; - -import org.jetbrains.annotations.NotNull; - -import java.lang.String; -import java.lang.System; - -public class Java { - public String f() { - return "Java"; - } - - public String f2() { - return "Hello"; - } - - public static void main(String[] args) { - hello.HelloPackage.main(new String[] {}); - } -} \ No newline at end of file diff --git a/compiler/testData/modules.xml/allOnce.txt b/compiler/testData/modules.xml/allOnce.txt index 50aeaa64fc1..f8f9ef58a27 100644 --- a/compiler/testData/modules.xml/allOnce.txt +++ b/compiler/testData/modules.xml/allOnce.txt @@ -3,4 +3,3 @@ name outputDir=out sources=[foo] classpath=[bar] - annotations=[baz] diff --git a/compiler/testData/modules.xml/allOnce.xml b/compiler/testData/modules.xml/allOnce.xml index 8398e19e9af..ba431fa3d90 100644 --- a/compiler/testData/modules.xml/allOnce.xml +++ b/compiler/testData/modules.xml/allOnce.xml @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/compiler/testData/modules.xml/comments.txt b/compiler/testData/modules.xml/comments.txt index d543f639837..63fbc8c6e74 100644 --- a/compiler/testData/modules.xml/comments.txt +++ b/compiler/testData/modules.xml/comments.txt @@ -3,4 +3,3 @@ name outputDir=out sources=[foo, foo1, foo2] classpath=[bar1, bar2] - annotations=[baz, baz1, baz2] diff --git a/compiler/testData/modules.xml/comments.xml b/compiler/testData/modules.xml/comments.xml index 3670646a176..c4f60130909 100644 --- a/compiler/testData/modules.xml/comments.xml +++ b/compiler/testData/modules.xml/comments.xml @@ -9,8 +9,5 @@ - - - \ No newline at end of file diff --git a/compiler/testData/modules.xml/emptyModule.txt b/compiler/testData/modules.xml/emptyModule.txt index cdc74a4ff43..736f6084a9b 100644 --- a/compiler/testData/modules.xml/emptyModule.txt +++ b/compiler/testData/modules.xml/emptyModule.txt @@ -3,4 +3,3 @@ name outputDir=out sources=[] classpath=[] - annotations=[] diff --git a/compiler/testData/modules.xml/manyTimes.txt b/compiler/testData/modules.xml/manyTimes.txt index 93fd7b2f9bc..94d7ed03429 100644 --- a/compiler/testData/modules.xml/manyTimes.txt +++ b/compiler/testData/modules.xml/manyTimes.txt @@ -3,4 +3,3 @@ name outputDir=out sources=[foo, foo1, foo2] classpath=[bar, bar1, bar2] - annotations=[baz, baz1, baz2] diff --git a/compiler/testData/modules.xml/manyTimes.xml b/compiler/testData/modules.xml/manyTimes.xml index 755f1a5e887..35b108c81eb 100644 --- a/compiler/testData/modules.xml/manyTimes.xml +++ b/compiler/testData/modules.xml/manyTimes.xml @@ -6,8 +6,5 @@ - - - \ No newline at end of file diff --git a/compiler/testData/modules.xml/onlySources.txt b/compiler/testData/modules.xml/onlySources.txt index 0e97c200e3d..f38780b4af3 100644 --- a/compiler/testData/modules.xml/onlySources.txt +++ b/compiler/testData/modules.xml/onlySources.txt @@ -3,4 +3,3 @@ name outputDir=out sources=[foo] classpath=[] - annotations=[] diff --git a/compiler/testData/modules.xml/twoModules.txt b/compiler/testData/modules.xml/twoModules.txt index 1716852b35e..75cb7494c3e 100644 --- a/compiler/testData/modules.xml/twoModules.txt +++ b/compiler/testData/modules.xml/twoModules.txt @@ -3,10 +3,8 @@ name outputDir=out sources=[foo, foo1, foo2] classpath=[bar, bar1, bar2] - annotations=[baz, baz1, baz2] name2 type=java-production outputDir=out2 sources=[2foo, 2foo1, 2foo2] classpath=[2bar, 2bar1, 2bar2] - annotations=[2baz, 2baz1, 2baz2] diff --git a/compiler/testData/modules.xml/twoModules.xml b/compiler/testData/modules.xml/twoModules.xml index 8edb5979c00..1501c8ad71c 100644 --- a/compiler/testData/modules.xml/twoModules.xml +++ b/compiler/testData/modules.xml/twoModules.xml @@ -6,9 +6,6 @@ - - - @@ -17,8 +14,5 @@ - - - \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java index aa17e6b8094..f30b05e627f 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java @@ -9112,60 +9112,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } } - @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Jdk_annotations extends AbstractJetDiagnosticsTest { - public void testAllFilesPresentInJdk_annotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/jdk-annotations"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("ArrayListAndMap.kt") - public void testArrayListAndMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.kt"); - doTest(fileName); - } - - @TestMetadata("ArrayListClone.kt") - public void testArrayListClone() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.kt"); - doTest(fileName); - } - - @TestMetadata("ArrayListToArray.kt") - public void testArrayListToArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.kt"); - doTest(fileName); - } - - @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations/sql") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Sql extends AbstractJetDiagnosticsTest { - public void testAllFilesPresentInSql() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/jdk-annotations/sql"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("DriverManager.kt") - public void testDriverManager() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.kt"); - doTest(fileName); - } - - @TestMetadata("ResultSet.kt") - public void testResultSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.kt"); - doTest(fileName); - } - - @TestMetadata("Statement.kt") - public void testStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.kt"); - doTest(fileName); - } - } - } - @TestMetadata("compiler/testData/diagnostics/tests/labels") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java index 7a2338f095c..599a7085e47 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java @@ -35,15 +35,12 @@ public class CompileEnvironmentTest extends TestCase { try { File out = new File(tempDir, "out"); File stdlib = ForTestCompileRuntime.runtimeJarForTests(); - File jdkAnnotations = JetTestUtils.getJdkAnnotationsJar(); ExitCode exitCode = new K2JVMCompiler().exec( System.out, JetTestUtils.getTestDataPathBase() + "/compiler/smoke/Smoke.kt", "-d", out.getAbsolutePath(), "-no-stdlib", - "-classpath", stdlib.getAbsolutePath(), - "-no-jdk-annotations", - "-annotations", jdkAnnotations.getAbsolutePath() + "-classpath", stdlib.getAbsolutePath() ); Assert.assertEquals(ExitCode.OK, exitCode); File[] files = out.listFiles(); diff --git a/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java b/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java index 7402d3d0688..acba9dc8603 100644 --- a/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java +++ b/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java @@ -65,7 +65,6 @@ public abstract class AbstractModuleXmlParserTest extends TestCase { "\n\ttype=" + module.getModuleType() + "\n\toutputDir=" + module.getOutputDirectory() + "\n\tsources=" + module.getSourceFiles() + - "\n\tclasspath=" + module.getClasspathRoots() + - "\n\tannotations=" + module.getAnnotationsRoots(); + "\n\tclasspath=" + module.getClasspathRoots(); } } diff --git a/idea/testData/modules.xml/basic.xml b/idea/testData/modules.xml/basic.xml index 792ec9e6da1..a11e90c32c0 100644 --- a/idea/testData/modules.xml/basic.xml +++ b/idea/testData/modules.xml/basic.xml @@ -8,8 +8,5 @@ - - - diff --git a/idea/testData/modules.xml/filtered.xml b/idea/testData/modules.xml/filtered.xml index cd565dc28dc..0bf86d9309b 100644 --- a/idea/testData/modules.xml/filtered.xml +++ b/idea/testData/modules.xml/filtered.xml @@ -7,8 +7,5 @@ - - - diff --git a/idea/testData/modules.xml/multiple.xml b/idea/testData/modules.xml/multiple.xml index 3a1c0e4bc4d..5c048945ca6 100644 --- a/idea/testData/modules.xml/multiple.xml +++ b/idea/testData/modules.xml/multiple.xml @@ -7,9 +7,6 @@ - - - @@ -19,8 +16,5 @@ - - - diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 507cd7f90a3..5da0e4c8c64 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -33,14 +33,6 @@ import org.jetbrains.jps.builders.logging.ProjectBuilderLogger; import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.incremental.ProjectBuildException; -import org.jetbrains.jps.model.java.JpsAnnotationRootType; -import org.jetbrains.jps.model.java.JpsJavaSdkType; -import org.jetbrains.jps.model.library.JpsLibrary; -import org.jetbrains.jps.model.library.sdk.JpsSdk; -import org.jetbrains.jps.model.library.sdk.JpsSdkType; -import org.jetbrains.jps.model.module.JpsDependencyElement; -import org.jetbrains.jps.model.module.JpsModule; -import org.jetbrains.jps.model.module.JpsSdkDependency; import org.jetbrains.kotlin.config.IncrementalCompilation; import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder; @@ -92,7 +84,6 @@ public class KotlinBuilderModuleScriptGenerator { moduleSources, findSourceRoots(context, target), findClassPathRoots(target), - findAnnotationRoots(target), (JavaModuleBuildTargetType) targetType, // this excludes the output directories from the class path, to be removed for true incremental compilation outputDirs @@ -149,33 +140,6 @@ public class KotlinBuilderModuleScriptGenerator { return result; } - @NotNull - private static List findAnnotationRoots(@NotNull ModuleBuildTarget target) { - LinkedHashSet annotationRootFiles = new LinkedHashSet(); - - JpsModule module = target.getModule(); - JpsSdk sdk = module.getSdk(getSdkType(module)); - if (sdk != null) { - annotationRootFiles.addAll(sdk.getParent().getFiles(JpsAnnotationRootType.INSTANCE)); - } - - for (JpsLibrary library : getAllDependencies(target).getLibraries()) { - annotationRootFiles.addAll(library.getFiles(JpsAnnotationRootType.INSTANCE)); - } - - // JDK is stored locally on user's machine, so its configuration, including external annotation paths - // is not available on TeamCity. When running on TeamCity, one has to provide extra path to JDK annotations - String extraAnnotationsPaths = System.getProperty("jps.kotlin.extra.annotation.paths"); - if (extraAnnotationsPaths != null) { - String[] paths = extraAnnotationsPaths.split(";"); - for (String path : paths) { - annotationRootFiles.add(new File(path)); - } - } - - return CollectionsKt.toList(annotationRootFiles); - } - @NotNull private static JpsSdkType getSdkType(@NotNull JpsModule module) { for (JpsDependencyElement dependency : module.getDependenciesList().getDependencies()) { diff --git a/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java b/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java index 1df8e11addd..a74c1a2f29b 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java +++ b/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java @@ -45,7 +45,6 @@ public class KotlinModuleXmlBuilder { List sourceFiles, List javaSourceRoots, Collection classpathRoots, - List annotationRoots, JavaModuleBuildTargetType targetType, Set directoriesToFilterOut ) { @@ -71,7 +70,6 @@ public class KotlinModuleXmlBuilder { processJavaSourceRoots(javaSourceRoots); processClasspath(classpathRoots, directoriesToFilterOut); - processAnnotationRoots(annotationRoots); closeTag(p, MODULE); return this; @@ -102,13 +100,6 @@ public class KotlinModuleXmlBuilder { } } - private void processAnnotationRoots(@NotNull List files) { - p.println(""); - for (File file : files) { - p.println("<", EXTERNAL_ANNOTATIONS, " ", PATH, "=\"", getEscapedPath(file), "\"/>"); - } - } - private void processJavaSourceRoots(@NotNull List files) { p.println(""); for (File file : files) { diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index c72a724e30f..b633b033098 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -22,7 +22,6 @@ import org.jetbrains.jps.builders.JpsBuildTestCase; import org.jetbrains.jps.model.JpsDummyElement; import org.jetbrains.jps.model.JpsModuleRootModificationUtil; import org.jetbrains.jps.model.JpsProject; -import org.jetbrains.jps.model.java.JpsAnnotationRootType; import org.jetbrains.jps.model.java.JpsJavaDependencyScope; import org.jetbrains.jps.model.java.JpsJavaLibraryType; import org.jetbrains.jps.model.java.JpsJavaSdkType; @@ -73,7 +72,6 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { String versionString = System.getProperty("java.version"); JpsTypedLibrary> jdk = myModel.getGlobal().addSdk(name, homePath, versionString, JpsJavaSdkType.INSTANCE); jdk.addRoot(JpsPathUtil.pathToUrl(path), JpsOrderRootType.COMPILED); - jdk.addRoot(JpsPathUtil.pathToUrl(PathUtil.getKotlinPathsForDistDirectory().getJdkAnnotationsPath().getAbsolutePath()), JpsAnnotationRootType.INSTANCE); return jdk.getProperties(); } diff --git a/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 0a22bde715a..ccc56bb75a3 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -45,7 +45,6 @@ public class ClasspathOrderTest : TestCaseWithTmpdir() { listOf(sourceDir), listOf(sourceDir), listOf(PathUtil.getKotlinPathsForDistDirectory().getRuntimePath()), - listOf(), JavaModuleBuildTargetType.PRODUCTION, setOf() ).asText().toString() diff --git a/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java index 0e40545b642..8c53fb95d41 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java +++ b/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java @@ -32,7 +32,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Arrays.asList(new File("s1"), new File("s2")), Collections.singletonList(new File("java")), Arrays.asList(new File("cp1"), new File("cp2")), - Arrays.asList(new File("a1/f1"), new File("a2")), JavaModuleBuildTargetType.PRODUCTION, Collections.emptySet() ).asText().toString(); @@ -46,7 +45,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Arrays.asList(new File("s1"), new File("s2")), Collections.emptyList(), Arrays.asList(new File("cp1"), new File("cp2")), - Arrays.asList(new File("a1/f1"), new File("a2")), JavaModuleBuildTargetType.PRODUCTION, Collections.singleton(new File("cp1")) ).asText().toString(); @@ -61,7 +59,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Arrays.asList(new File("s1"), new File("s2")), Collections.emptyList(), Arrays.asList(new File("cp1"), new File("cp2")), - Arrays.asList(new File("a1/f1"), new File("a2")), JavaModuleBuildTargetType.PRODUCTION, Collections.singleton(new File("cp1")) ); @@ -71,7 +68,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Arrays.asList(new File("s12"), new File("s22")), Collections.emptyList(), Arrays.asList(new File("cp12"), new File("cp22")), - Arrays.asList(new File("a12/f12"), new File("a22")), JavaModuleBuildTargetType.TEST, Collections.singleton(new File("cp12")) ); diff --git a/libraries/examples/kotlin-gradle-subplugin-example/pom.xml b/libraries/examples/kotlin-gradle-subplugin-example/pom.xml index aed881a7690..74ed1a81111 100644 --- a/libraries/examples/kotlin-gradle-subplugin-example/pom.xml +++ b/libraries/examples/kotlin-gradle-subplugin-example/pom.xml @@ -63,11 +63,6 @@ kotlin-maven-plugin org.jetbrains.kotlin ${project.version} - - - ${basedir}/kotlinAnnotation - - diff --git a/libraries/tools/kotlin-android-extensions/pom.xml b/libraries/tools/kotlin-android-extensions/pom.xml index 001a702968a..49be56a4d54 100644 --- a/libraries/tools/kotlin-android-extensions/pom.xml +++ b/libraries/tools/kotlin-android-extensions/pom.xml @@ -63,11 +63,6 @@ kotlin-maven-plugin org.jetbrains.kotlin ${project.version} - - - ${basedir}/kotlinAnnotation - - diff --git a/libraries/tools/kotlin-gradle-plugin-api/pom.xml b/libraries/tools/kotlin-gradle-plugin-api/pom.xml index d0332e5495f..1d9513f0a7e 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/pom.xml +++ b/libraries/tools/kotlin-gradle-plugin-api/pom.xml @@ -56,11 +56,6 @@ kotlin-maven-plugin org.jetbrains.kotlin ${project.version} - - - ${basedir}/kotlinAnnotation - - diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/android/build/gradle/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/android/build/gradle/annotations.xml deleted file mode 100644 index a86a23af2a8..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/android/build/gradle/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/android/build/gradle/api/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/android/build/gradle/api/annotations.xml deleted file mode 100644 index 500ef07cd98..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/android/build/gradle/api/annotations.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/google/common/base/annotations.xml deleted file mode 100644 index 69ed1be5713..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/google/common/base/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/google/common/io/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/google/common/io/annotations.xml deleted file mode 100644 index 64ac65dcca1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/google/common/io/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/apache/commons/io/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/apache/commons/io/annotations.xml deleted file mode 100644 index 0aee42a6e6a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/apache/commons/io/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/annotations.xml deleted file mode 100644 index 55a42927e18..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/annotations.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/artifacts/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/artifacts/annotations.xml deleted file mode 100644 index 622af2f52eb..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/artifacts/annotations.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/artifacts/dsl/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/artifacts/dsl/annotations.xml deleted file mode 100644 index 2629a955f8a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/artifacts/dsl/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/file/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/file/annotations.xml deleted file mode 100644 index 10a2d3e4183..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/file/annotations.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml deleted file mode 100644 index 9f68f95d91a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/internal/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/internal/annotations.xml deleted file mode 100644 index 0c7f23a66ff..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/internal/annotations.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml deleted file mode 100644 index 6595499a4a1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/logging/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/logging/annotations.xml deleted file mode 100644 index 87c8bc5da18..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/logging/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/plugins/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/plugins/annotations.xml deleted file mode 100644 index 7e2d6dea446..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/plugins/annotations.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/annotations.xml deleted file mode 100644 index f379f72b327..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/annotations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml deleted file mode 100644 index 812dfa500fa..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-core/pom.xml b/libraries/tools/kotlin-gradle-plugin-core/pom.xml index 62c431995ac..d304d1da3e0 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/pom.xml +++ b/libraries/tools/kotlin-gradle-plugin-core/pom.xml @@ -47,11 +47,6 @@ kotlin-compiler-embeddable ${project.version} - - org.jetbrains.kotlin - kotlin-jdk-annotations - ${project.version} - org.jetbrains.kotlin kotlin-stdlib @@ -64,12 +59,6 @@ ${project.basedir}/src/main/kotlin - - - ${kotlin-sdk}/lib - kotlin-jdk-annotations.jar - false - ${project.basedir}/src/main/resources @@ -80,11 +69,6 @@ kotlin-maven-plugin org.jetbrains.kotlin ${project.version} - - - ${basedir}/kotlinAnnotation - - diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index fa8c1304525..20718004851 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -1,31 +1,32 @@ package org.jetbrains.kotlin.gradle.tasks -import org.gradle.api.tasks.compile.AbstractCompile -import java.io.File +import com.intellij.ide.highlighter.JavaFileType +import com.intellij.openapi.util.io.FileUtil +import org.apache.commons.io.FileUtils +import org.apache.commons.io.FilenameUtils +import org.apache.commons.lang.StringUtils +import org.codehaus.groovy.runtime.MethodClosure import org.gradle.api.GradleException -import org.jetbrains.kotlin.cli.common.ExitCode +import org.gradle.api.file.SourceDirectorySet +import org.gradle.api.logging.Logger +import org.gradle.api.logging.Logging import org.gradle.api.tasks.SourceTask import java.util.HashSet import org.gradle.api.tasks.TaskAction -import org.gradle.api.file.SourceDirectorySet -import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler -import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments -import org.jetbrains.kotlin.cli.common.messages.MessageCollector -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation -import org.gradle.api.logging.Logger -import org.gradle.api.logging.Logging -import org.apache.commons.lang.StringUtils -import org.apache.commons.io.FileUtils -import org.gradle.api.Project -import org.jetbrains.kotlin.config.Services -import org.jetbrains.kotlin.cli.js.K2JSCompiler -import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments -import org.codehaus.groovy.runtime.MethodClosure -import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.gradle.api.tasks.compile.AbstractCompile import org.jetbrains.kotlin.cli.common.CLICompiler -import com.intellij.ide.highlighter.JavaFileType -import org.jetbrains.kotlin.idea.JetFileType +import org.jetbrains.kotlin.cli.common.ExitCode +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.cli.js.K2JSCompiler +import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler +import org.jetbrains.kotlin.config.Services +import org.jetbrains.kotlin.doc.KDocArguments +import org.jetbrains.kotlin.doc.KDocCompiler import org.jetbrains.kotlin.utils.LibraryUtils import com.intellij.openapi.util.io.FileUtil import org.apache.commons.io.FilenameUtils @@ -37,6 +38,8 @@ import java.io.IOException import java.lang.ref.WeakReference val DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations" +import java.io.File +import java.util.HashSet val ANNOTATIONS_PLUGIN_NAME = "org.jetbrains.kotlin.kapt" @@ -134,16 +137,7 @@ public open class KotlinCompile() : AbstractKotlinCompile ExtraPropertiesExtension.getOrNull(id: String): T? { } } -fun getAnnotations(project: Project, logger: Logger): Collection { - @Suppress("UNCHECKED_CAST") - val annotations = project.getExtensions().getByName(DEFAULT_ANNOTATIONS) as Collection - - if (!annotations.isEmpty()) { - logger.info("using default annontations from [${annotations.map { it.getPath() }}]") - return annotations - } else { - throw GradleException("Default annotations not found in Kotlin gradle plugin classpath") - } -} - class GradleMessageCollector(val logger: Logger) : MessageCollector { public override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) { val text = with(StringBuilder()) { diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/android/build/gradle/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/android/build/gradle/annotations.xml deleted file mode 100644 index a86a23af2a8..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/android/build/gradle/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/android/build/gradle/api/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/android/build/gradle/api/annotations.xml deleted file mode 100644 index 500ef07cd98..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/android/build/gradle/api/annotations.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/google/common/base/annotations.xml deleted file mode 100644 index 69ed1be5713..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/google/common/base/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/google/common/io/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/google/common/io/annotations.xml deleted file mode 100644 index 64ac65dcca1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/google/common/io/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/apache/commons/io/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/apache/commons/io/annotations.xml deleted file mode 100644 index 0aee42a6e6a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/apache/commons/io/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/annotations.xml deleted file mode 100644 index 67c82aa96e6..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/annotations.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/artifacts/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/artifacts/annotations.xml deleted file mode 100644 index 622af2f52eb..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/artifacts/annotations.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/artifacts/dsl/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/artifacts/dsl/annotations.xml deleted file mode 100644 index 0402ed182e0..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/artifacts/dsl/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/file/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/file/annotations.xml deleted file mode 100644 index 86cc0e5f0c1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/file/annotations.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml deleted file mode 100644 index 9f68f95d91a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/internal/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/internal/annotations.xml deleted file mode 100644 index 0c7f23a66ff..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/internal/annotations.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml deleted file mode 100644 index 6595499a4a1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/logging/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/logging/annotations.xml deleted file mode 100644 index 87c8bc5da18..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/logging/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/plugins/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/plugins/annotations.xml deleted file mode 100644 index fb08bfa4358..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/plugins/annotations.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/tasks/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/tasks/annotations.xml deleted file mode 100644 index 67bc433ea20..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/tasks/annotations.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml b/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml deleted file mode 100644 index 812dfa500fa..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/pom.xml b/libraries/tools/kotlin-gradle-plugin/pom.xml index 6e9e12b85a4..7dd2f8dd5e3 100644 --- a/libraries/tools/kotlin-gradle-plugin/pom.xml +++ b/libraries/tools/kotlin-gradle-plugin/pom.xml @@ -72,11 +72,6 @@ kotlin-maven-plugin org.jetbrains.kotlin ${project.version} - - - ${basedir}/kotlinAnnotation - - @@ -107,9 +102,7 @@ verify org.jetbrains.kotlin:kotlin-gradle-plugin-core:${project.version} - org.jetbrains.kotlin:kotlin-jdk-annotations:${project.version} org.jetbrains.kotlin:kotlin-js-library:${project.version} - org.jetbrains.kotlin:kotlin-android-sdk-annotations:${project.version} diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index 5429e910518..f47837c567d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -36,8 +36,6 @@ import org.jetbrains.kotlin.gradle.internal.initKapt import java.net.URL import java.util.jar.Manifest -val DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations" - val KOTLIN_AFTER_JAVA_TASK_SUFFIX = "AfterJava" abstract class KotlinSourceSetProcessor( @@ -239,9 +237,6 @@ abstract class AbstractKotlinPlugin @Inject constructor(val scriptHandler: Scrip project.getPlugins().apply(javaClass()) configureSourceSetDefaults(project as ProjectInternal, javaBasePlugin, javaPluginConvention) - - val gradleUtils = GradleUtils(scriptHandler, project) - project.getExtensions().add(DEFAULT_ANNOTATIONS, gradleUtils.resolveKotlinPluginDependency("kotlin-jdk-annotations")) } open protected fun configureSourceSetDefaults(project: ProjectInternal, @@ -332,9 +327,6 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand ext, plugin, aptConfigurations) } } - - project.getExtensions().add(DEFAULT_ANNOTATIONS, GradleUtils(scriptHandler, project) - .resolveKotlinPluginDependency("kotlin-android-sdk-annotations")) } private fun processVariantData( @@ -534,8 +526,6 @@ open class GradleUtils(val scriptHandler: ScriptHandler, val project: ProjectInt public fun kotlinPluginArtifactCoordinates(artifact: String): String = "org.jetbrains.kotlin:${artifact}:${kotlinPluginVersion()}" public fun kotlinJsLibraryCoordinates(): String = kotlinPluginArtifactCoordinates("kotlin-js-library") - public fun resolveKotlinPluginDependency(artifact: String): Collection = - resolveDependencies(kotlinPluginArtifactCoordinates(artifact)) public fun resolveJsLibrary(): File = resolveDependencies(kotlinJsLibraryCoordinates()).first() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle index 365da435f44..ce300388df2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle @@ -21,10 +21,6 @@ android { compileSdkVersion 22 buildToolsVersion "21.1.2" - kotlinOptions { - annotations = "kotlinAnnotations" - } - sourceSets { main.kotlin.srcDirs += 'root/kotlin' } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/kotlinAnnotations/android/app/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/kotlinAnnotations/android/app/annotations.xml deleted file mode 100644 index 480db34155f..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/kotlinAnnotations/android/app/annotations.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/build.gradle index 873505e6b73..e6dd7a4cc61 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/build.gradle @@ -44,12 +44,6 @@ task show << { buildscript.configurations.classpath.each { println it } } - -compileKotlin { - kotlinOptions.annotations = "externalAnnotations" -} - - task wrapper(type: Wrapper) { gradleVersion="1.4" -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/externalAnnotations/com/google/common/base/annotations.xml deleted file mode 100644 index fd541a7e6e5..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/externalAnnotations/com/google/common/base/annotations.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/build.gradle index 0f5e79ee285..ceb38426f1e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/build.gradle @@ -39,11 +39,6 @@ test { useTestNG() } -compileKotlin { - kotlinOptions.annotations = "externalAnnotations" -} - - task wrapper(type: Wrapper) { gradleVersion="1.4" -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/externalAnnotations/com/google/common/base/annotations.xml deleted file mode 100644 index fd541a7e6e5..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/externalAnnotations/com/google/common/base/annotations.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinGradleSubplugin/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinGradleSubplugin/build.gradle index 528972d1c7e..9d6ea8c6559 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinGradleSubplugin/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinGradleSubplugin/build.gradle @@ -28,12 +28,6 @@ task show << { buildscript.configurations.classpath.each { println it } } - -compileKotlin { - kotlinOptions.annotations = "externalAnnotations" -} - - task wrapper(type: Wrapper) { gradleVersion="1.4" -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/build.gradle index 73cbf528fff..5af1901f789 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/build.gradle @@ -39,12 +39,6 @@ task show << { buildscript.configurations.classpath.each { println it } } - -compileKotlin { - kotlinOptions.annotations = "externalAnnotations" -} - - task wrapper(type: Wrapper) { gradleVersion="1.4" } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/externalAnnotations/com/google/common/base/annotations.xml deleted file mode 100644 index be8ddab04a3..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/externalAnnotations/com/google/common/base/annotations.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/build.gradle index 66e939cad54..db74c8312e6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/build.gradle @@ -34,12 +34,6 @@ task show << { buildscript.configurations.classpath.each { println it } } - -compileKotlin { - kotlinOptions.annotations = "externalAnnotations" -} - - task wrapper(type: Wrapper) { gradleVersion="1.4" } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/externalAnnotations/com/google/common/base/annotations.xml deleted file mode 100644 index be8ddab04a3..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/externalAnnotations/com/google/common/base/annotations.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/build.gradle index 03b685a6585..f7464809d66 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/build.gradle @@ -41,12 +41,6 @@ task show << { buildscript.configurations.classpath.each { println it } } - -compileKotlin { - kotlinOptions.annotations = "externalAnnotations" -} - - task wrapper(type: Wrapper) { gradleVersion="1.4" -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/externalAnnotations/com/google/common/base/annotations.xml deleted file mode 100644 index fd541a7e6e5..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/externalAnnotations/com/google/common/base/annotations.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml index ed1ad825834..df5fc53bf5e 100644 --- a/libraries/tools/kotlin-maven-plugin/pom.xml +++ b/libraries/tools/kotlin-maven-plugin/pom.xml @@ -40,11 +40,6 @@ kotlin-compiler ${project.version} - - org.jetbrains.kotlin - kotlin-jdk-annotations - ${project.version} - org.codehaus.groovy groovy-all diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java index fecea9053a9..a8b8e336144 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.maven; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; import com.sampullara.cli.Args; import kotlin.CollectionsKt; @@ -33,15 +32,8 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.net.URLClassLoader; import java.util.ArrayList; -import java.util.Enumeration; import java.util.List; -import java.util.Set; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; import static com.intellij.openapi.util.text.StringUtil.join; @@ -52,15 +44,6 @@ import static com.intellij.openapi.util.text.StringUtil.join; */ @Mojo(name = "compile", defaultPhase = LifecyclePhase.COMPILE, requiresDependencyResolution = ResolutionScope.COMPILE) public class K2JVMCompileMojo extends KotlinCompileMojoBase { - /** - * The directories used to scan for annotation.xml files for Kotlin annotations - */ - @Parameter - public List annotationPaths; - - @Parameter(defaultValue = "true") - public boolean scanForAnnotations; - /** * Project classpath. */ @@ -114,13 +97,6 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase filterClassPath(List classpath) { - return CollectionsKt.filter(classpath, new Function1() { - @Override - public Boolean invoke(String s) { - return new File(s).exists() || new File(project.getBasedir(), s).exists(); - } - }); - } - - protected String getFullAnnotationsPath(Log log, List annotations) { - String jdkAnnotation = getJdkAnnotations().getPath(); - - List list = new ArrayList(); - list.add(jdkAnnotation); - - if (annotations != null) { - for (String annotationPath : annotations) { - if (new File(annotationPath).exists()) { - list.add(annotationPath); - } else { - log.info("annotation path " + annotationPath + " does not exist"); - } - } - } - - if (scanForAnnotations) { - for (String path : scanAnnotations(log)) { - if (!list.contains(path)) { - list.add(path); - } - } - } - - return join(list, File.pathSeparator); - } - - @NotNull - private static File getJdkAnnotations() { - ClassLoader classLoader = KotlinCompileMojoBase.class.getClassLoader(); - if (!(classLoader instanceof URLClassLoader)) { - throw new RuntimeException("Kotlin plugin`s class loader is not URLClassLoader"); - } - - for (URL url : ((URLClassLoader) classLoader).getURLs()) { - String path = url.getPath(); - if (StringUtil.isEmpty(path)) { - continue; - } - - File file = new File(path); - if (file.getName().startsWith("kotlin-jdk-annotations")) { - return file; - } - } - - throw new RuntimeException("Could not get jdk annotations from Kotlin plugin`s classpath"); - } - - private List scanAnnotations(Log log) { - List annotations = new ArrayList(); - - Set artifacts = project.getArtifacts(); - for (Artifact artifact : artifacts) { - File file = artifact.getFile(); - if (file.isFile() && containsAnnotations(file, log)) { - log.info("Discovered kotlin annotations in: " + file); - try { - annotations.add(file.getCanonicalPath()); - } - catch (IOException e) { - log.warn("Error extracting canonical path from: " + file, e); - } - } - } - - return annotations; - } - - private static boolean containsAnnotations(File file, Log log) { - log.debug("Scanning for kotlin annotations in " + file); - - ZipFile zipFile = null; - try { - zipFile = new ZipFile(file); - - Enumeration entries = zipFile.entries(); - while (entries.hasMoreElements()) { - String name = entries.nextElement().getName(); - if (name.endsWith("/annotations.xml")) { - return true; - } - } - } - catch (IOException e) { - log.warn("Error reading contents of jar: " + file, e); - } - finally { - if (zipFile != null) { - try { - zipFile.close(); - } - catch (IOException e) { - log.warn("Error closing: " + zipFile, e); - } - } - } - return false; - } } -