restore compilation after rebase of dropping external annotations; fix affected tests
Original commit: 7e2c2ef678
This commit is contained in:
@@ -246,7 +246,6 @@ public object KotlinCompilerRunner {
|
||||
with(settings) {
|
||||
module = moduleFile.absolutePath
|
||||
noStdlib = true
|
||||
noJdkAnnotations = true
|
||||
noJdk = true
|
||||
}
|
||||
}
|
||||
|
||||
-11
@@ -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() {}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user