azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore compilation after rebase of dropping external annotations; fix affected tests

Browse Source 
Original commit: 7e2c2ef678
This commit is contained in:
Dmitry Jemerov
2015-10-08 13:55:39 +02:00
parent 1dcc772f45
commit 6bbf3aaf66
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt
-1
View File
@@ -246,7 +246,6 @@ public object KotlinCompilerRunner {
with(settings) { with(settings) {
module = moduleFile.absolutePath module = moduleFile.absolutePath
noStdlib = true noStdlib = true
noJdkAnnotations = true
noJdk = true noJdk = true
} }
} }
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java
-11
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.MultiMap; import com.intellij.util.containers.MultiMap;
import kotlin.CollectionsKt;
import kotlin.io.FilesKt; import kotlin.io.FilesKt;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -140,15 +139,5 @@ public class KotlinBuilderModuleScriptGenerator {
return result; 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() {} private KotlinBuilderModuleScriptGenerator() {}
} }