diff --git a/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.kt b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.kt index 6cb77bf15d6..2f23f9143e1 100644 --- a/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.kt +++ b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.kt @@ -27,20 +27,10 @@ import java.io.File import java.util.* class KotlinCompilerAdapter : Javac13() { - - var externalAnnotations: Path? = null - var moduleName: String? = null var additionalArguments: MutableList = ArrayList(0) - fun createExternalAnnotations(): Path { - if (externalAnnotations == null) { - externalAnnotations = Path(getProject()) - } - return externalAnnotations!!.createPath() - } - fun createCompilerArg(): Commandline.Argument { val argument = Commandline.Argument() additionalArguments.add(argument) @@ -70,8 +60,6 @@ class KotlinCompilerAdapter : Javac13() { // it is constructed only of sources which are newer than classes with the same name kotlinc.src = javac.srcdir - kotlinc.externalAnnotations = externalAnnotations - if (moduleName == null) { moduleName = javac.defaultModuleName } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index 79644d1a316..9f144269479 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -121,8 +121,6 @@ public open class K2JVMCompiler : CLICompiler() { configuration.addJvmClasspathRoots(getClasspath(paths, arguments)) - configuration.addAll(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, getAnnotationsPath(paths, arguments)) - configuration.put(JVMConfigurationKeys.MODULE_NAME, arguments.moduleName ?: JvmAbi.DEFAULT_MODULE_NAME) if (arguments.module == null && arguments.freeArgs.isEmpty() && !arguments.version) { @@ -287,17 +285,6 @@ public open class K2JVMCompiler : CLICompiler() { } return classpath } - - private fun getAnnotationsPath(paths: KotlinPaths, arguments: K2JVMCompilerArguments): List { - val annotationsPath = arrayListOf() - if (arguments.annotations != null) { - annotationsPath.addAll(arguments.annotations.split(File.pathSeparatorChar).map { File(it) }) - } - if (!arguments.noJdkAnnotations) { - annotationsPath.add(paths.getJdkAnnotationsPath()) - } - return annotationsPath - } } } diff --git a/compiler/testData/modules.xml/typeTestModule.txt b/compiler/testData/modules.xml/typeTestModule.txt index c3b7dab328a..926a9c1c835 100644 --- a/compiler/testData/modules.xml/typeTestModule.txt +++ b/compiler/testData/modules.xml/typeTestModule.txt @@ -3,4 +3,3 @@ name outputDir=out sources=[] classpath=[] - annotations=[] diff --git a/compiler/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt b/compiler/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt index bcb9d2f83e2..67a0c6e3291 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt +++ b/compiler/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt @@ -17,12 +17,10 @@ package org.jetbrains.kotlin.test public enum class ConfigurationKind( - public val withJdkAnnotations: Boolean, public val withRuntime: Boolean, public val withReflection: Boolean ) { - JDK_ONLY(withJdkAnnotations = false, withRuntime = false, withReflection = false), - JDK_AND_ANNOTATIONS(withJdkAnnotations = true, withRuntime = false, withReflection = false), - NO_KOTLIN_REFLECT(withJdkAnnotations = true, withRuntime = true, withReflection = false), - ALL(withJdkAnnotations = true, withRuntime = true, withReflection = true), + JDK_ONLY(withRuntime = false, withReflection = false), + NO_KOTLIN_REFLECT(withRuntime = true, withReflection = false), + ALL(withRuntime = true, withReflection = true), } diff --git a/compiler/util/src/org/jetbrains/kotlin/modules/Module.kt b/compiler/util/src/org/jetbrains/kotlin/modules/Module.kt index 9b297639f40..45a81f619c9 100644 --- a/compiler/util/src/org/jetbrains/kotlin/modules/Module.kt +++ b/compiler/util/src/org/jetbrains/kotlin/modules/Module.kt @@ -27,7 +27,5 @@ public interface Module { public fun getClasspathRoots(): List - public fun getAnnotationsRoots(): List - public fun getJavaSourceRoots(): List } diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java index 966ed1b96ff..4cf9ab7f316 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java @@ -18,13 +18,7 @@ package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.projectRoots.JavaSdk; import com.intellij.openapi.projectRoots.Sdk; -import com.intellij.openapi.projectRoots.SdkModificator; -import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; -import com.intellij.openapi.roots.AnnotationOrderRootType; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.vfs.JarFileSystem; -import com.intellij.openapi.vfs.LocalFileSystem; -import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.test.JetTestUtils; @@ -43,13 +37,7 @@ public class PluginTestCaseBase { @NotNull private static Sdk getSdk(String sdkHome) { - Sdk sdk = JavaSdk.getInstance().createJdk("JDK", sdkHome, true); - SdkModificator modificator = sdk.getSdkModificator(); - VirtualFile file = LocalFileSystem.getInstance().findFileByIoFile(getJdkAnnotationsJar()); - assert file != null; - modificator.addRoot(JarFileSystem.getInstance().getJarRootForLocalFile(file), AnnotationOrderRootType.getInstance()); - modificator.commitChanges(); - return sdk; + return JavaSdk.getInstance().createJdk("JDK", sdkHome, true); } @NotNull @@ -64,15 +52,6 @@ public class PluginTestCaseBase { return getSdk(javaHome); } - @NotNull - public static File getJdkAnnotationsJar() { - File jdkAnnotations = new File(JetTestUtils.getHomeDirectory(), "dist/kotlinc/lib/kotlin-jdk-annotations.jar"); - if (!jdkAnnotations.exists()) { - throw new RuntimeException("Kotlin JDK annotations jar not found; please run 'ant dist' to build it"); - } - return jdkAnnotations; - } - public static boolean isAllFilesPresentTest(@NotNull String testName) { return StringUtil.startsWithIgnoreCase(testName, "allFilesPresentIn"); } diff --git a/idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt.after b/idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt.after index 22b10d579fb..fc8def07ce9 100644 --- a/idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt.after +++ b/idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt.after @@ -2,6 +2,6 @@ import java.net.URI // WITH_RUNTIME -fun foo(): URI { +fun foo(): URI? { return java.io.File("x").toURI() } \ No newline at end of file diff --git a/idea/testData/quickfix/supertypeInitialization/addImport.kt.after b/idea/testData/quickfix/supertypeInitialization/addImport.kt.after index dffc36ab1c8..514b2addb1d 100644 --- a/idea/testData/quickfix/supertypeInitialization/addImport.kt.after +++ b/idea/testData/quickfix/supertypeInitialization/addImport.kt.after @@ -2,4 +2,4 @@ import java.io.DataInputStream import java.io.InputStream -class C(p0: InputStream) : DataInputStream(p0) +class C(p0: InputStream?) : DataInputStream(p0) diff --git a/idea/testData/quickfix/supertypeInitialization/multipleConstructors.kt.after b/idea/testData/quickfix/supertypeInitialization/multipleConstructors.kt.after index f1d974efc09..f3e8c2afb8f 100644 --- a/idea/testData/quickfix/supertypeInitialization/multipleConstructors.kt.after +++ b/idea/testData/quickfix/supertypeInitialization/multipleConstructors.kt.after @@ -2,4 +2,4 @@ // ACTION: Add constructor parameters from ArrayList(Int) import java.util.ArrayList -class C(p0: MutableCollection) : ArrayList(p0) +class C(p0: MutableCollection?) : ArrayList(p0) diff --git a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 4e1eb3db364..8c6da3b0209 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -246,7 +246,6 @@ public object KotlinCompilerRunner { with(settings) { module = moduleFile.absolutePath noStdlib = true - noJdkAnnotations = true noJdk = true } } 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 5da0e4c8c64..3425490f7c7 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -21,7 +21,6 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; -import kotlin.CollectionsKt; import kotlin.io.FilesKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -140,15 +139,5 @@ public class KotlinBuilderModuleScriptGenerator { return result; } - @NotNull - private static JpsSdkType getSdkType(@NotNull JpsModule module) { - for (JpsDependencyElement dependency : module.getDependenciesList().getDependencies()) { - if (dependency instanceof JpsSdkDependency) { - return ((JpsSdkDependency) dependency).getSdkType(); - } - } - return JpsJavaSdkType.INSTANCE; - } - private KotlinBuilderModuleScriptGenerator() {} } 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 20718004851..c23450e0abd 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 @@ -36,11 +36,11 @@ import org.gradle.api.tasks.compile.JavaCompile import org.jetbrains.org.objectweb.asm.ClassWriter 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 DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations" + val ANNOTATIONS_PLUGIN_NAME = "org.jetbrains.kotlin.kapt" abstract class AbstractKotlinCompile() : AbstractCompile() { 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 a8b8e336144..67b80af01b7 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 @@ -97,6 +97,9 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase