diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 4e1eb3db364..8c6da3b0209 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/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/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 5da0e4c8c64..3425490f7c7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/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() {} }