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

Fix maven build.

Browse Source
This commit is contained in:
pTalanov
2012-05-02 16:38:50 +04:00
parent 4830d47e83
commit 359778906d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
+1 -1
View File
@@ -86,7 +86,7 @@ public abstract class CLICompiler<A extends CompilerArguments, C extends Compile
* based tools to customise their own plugins * based tools to customise their own plugins
*/ */
//TODO: add parameter annotations when KT-1863 is resolved //TODO: add parameter annotations when KT-1863 is resolved
protected void configureEnvironment(C configuration, A arguments) { protected void configureEnvironment(@NotNull C configuration, @NotNull A arguments) {
List<CompilerPlugin> plugins = arguments.getCompilerPlugins(); List<CompilerPlugin> plugins = arguments.getCompilerPlugins();
configuration.getCompilerPlugins().addAll(plugins); configuration.getCompilerPlugins().addAll(plugins);
} }
compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
+1 -1
View File
@@ -175,7 +175,7 @@ public class K2JVMCompiler extends CLICompiler<K2JVMCompilerArguments, K2JVMComp
@Override @Override
protected void configureEnvironment(K2JVMCompileEnvironmentConfiguration configuration, K2JVMCompilerArguments arguments) { protected void configureEnvironment(@NotNull K2JVMCompileEnvironmentConfiguration configuration, @NotNull K2JVMCompilerArguments arguments) {
super.configureEnvironment(configuration, arguments); super.configureEnvironment(configuration, arguments);
if (configuration.getEnvironment().getCompilerDependencies().getRuntimeJar() != null) { if (configuration.getEnvironment().getCompilerDependencies().getRuntimeJar() != null) {
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt
+1 -1
View File
@@ -22,7 +22,7 @@ fun main(args: Array<String?>): Unit {
*/ */
class KDocCompiler() : K2JVMCompiler() { class KDocCompiler() : K2JVMCompiler() {
protected override fun configureEnvironment(configuration : CompileEnvironmentConfiguration?, arguments : K2JVMCompilerArguments?) { protected override fun configureEnvironment(configuration : K2JVMCompileEnvironmentConfiguration, arguments : K2JVMCompilerArguments) {
super.configureEnvironment(configuration, arguments) super.configureEnvironment(configuration, arguments)
val coreEnvironment = configuration?.getEnvironment() val coreEnvironment = configuration?.getEnvironment()
if (coreEnvironment != null) { if (coreEnvironment != null) {