From 0901c98ff8123ea1aec7385354cb149c94235b8d Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 8 Oct 2013 22:39:39 +0400 Subject: [PATCH] CLI: move *CompilerArguments classes to cli-common module. --- .../arguments}/CommonCompilerArguments.java | 19 +++++++++++++++++-- .../common/arguments}/CompilerArguments.java | 6 +++--- .../arguments}/K2JSCompilerArguments.java | 4 +--- .../arguments}/K2JVMCompilerArguments.java | 5 +---- .../jetbrains/jet/cli/common/CLICompiler.java | 1 + .../jetbrains/jet/cli/js/K2JSCompiler.java | 1 + .../jetbrains/jet/cli/jvm/K2JVMCompiler.java | 1 + compiler/testData/cli/help.out | 2 +- compiler/testData/cli/wrongArgument.out | 2 +- .../CompileMavenGeneratedJSLibrary.java | 2 +- .../k2js/test/semantics/StdLibTestBase.java | 2 +- .../jetbrains/kotlin/maven/doc/KDocMojo.java | 4 ++-- .../org/jetbrains/kotlin/doc/KDocCompiler.kt | 2 +- .../test/kotlin/kdoc/HtmlVisitorTest.kt | 2 +- .../kotlin/gradle/plugin/KotlinPlugin.kt | 2 +- .../jetbrains/kotlin/gradle/tasks/Tasks.kt | 4 ++-- .../kotlin/maven/K2JSCompilerMojo.java | 4 ++-- .../kotlin/maven/KotlinCompileMojo.java | 4 ++-- .../kotlin/maven/KotlinCompileMojoBase.java | 4 ++-- .../kotlin/maven/KotlinTestCompileMojo.java | 4 ++-- 20 files changed, 44 insertions(+), 31 deletions(-) rename compiler/cli/{src/org/jetbrains/jet/cli => cli-common/src/org/jetbrains/jet/cli/common/arguments}/CommonCompilerArguments.java (66%) rename compiler/cli/{src/org/jetbrains/jet/cli/common => cli-common/src/org/jetbrains/jet/cli/common/arguments}/CompilerArguments.java (86%) rename compiler/cli/{src/org/jetbrains/jet/cli/js => cli-common/src/org/jetbrains/jet/cli/common/arguments}/K2JSCompilerArguments.java (95%) rename compiler/cli/{src/org/jetbrains/jet/cli/jvm => cli-common/src/org/jetbrains/jet/cli/common/arguments}/K2JVMCompilerArguments.java (97%) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/CommonCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/CommonCompilerArguments.java similarity index 66% rename from compiler/cli/src/org/jetbrains/jet/cli/CommonCompilerArguments.java rename to compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/CommonCompilerArguments.java index 6446928551d..c962a6c486d 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/CommonCompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/CommonCompilerArguments.java @@ -1,7 +1,22 @@ -package org.jetbrains.jet.cli; +/* + * Copyright 2010-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.cli.common.arguments; import com.sampullara.cli.Argument; -import org.jetbrains.jet.cli.common.CompilerArguments; public abstract class CommonCompilerArguments extends CompilerArguments { @Argument(value = "tags", description = "Demarcate each compilation message (error, warning, etc) with an open and close tag") diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/CompilerArguments.java similarity index 86% rename from compiler/cli/src/org/jetbrains/jet/cli/common/CompilerArguments.java rename to compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/CompilerArguments.java index b32de6fbf04..66549b57a0f 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/CompilerArguments.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common; +package org.jetbrains.jet.cli.common.arguments; -import com.google.common.collect.Lists; +import com.intellij.util.SmartList; import java.util.List; public abstract class CompilerArguments { - public List freeArgs = Lists.newArrayList(); + public List freeArgs = new SmartList(); public abstract boolean isHelp(); public abstract boolean isTags(); diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JSCompilerArguments.java similarity index 95% rename from compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompilerArguments.java rename to compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JSCompilerArguments.java index c9a99e60edc..9ee26bbf5fd 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JSCompilerArguments.java @@ -14,12 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.js; +package org.jetbrains.jet.cli.common.arguments; import com.sampullara.cli.Argument; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.cli.CommonCompilerArguments; - /** * NOTE: for now K2JSCompiler supports only minimal amount of parameters required to launch it from the plugin. diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JVMCompilerArguments.java similarity index 97% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java rename to compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JVMCompilerArguments.java index 5e2fe699f50..c02fc370525 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JVMCompilerArguments.java @@ -15,10 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.jet.cli.jvm; +package org.jetbrains.jet.cli.common.arguments; import com.sampullara.cli.Argument; -import org.jetbrains.jet.cli.CommonCompilerArguments; import java.util.List; @@ -27,8 +26,6 @@ import java.util.List; */ @SuppressWarnings("UnusedDeclaration") public class K2JVMCompilerArguments extends CommonCompilerArguments { - - // TODO ideally we'd unify this with 'src' to just having a single field that supports multiple files/dirs private List sourceDirs; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java index 7dbc9797c47..7c5a7199d69 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java @@ -22,6 +22,7 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; import com.sampullara.cli.Args; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.cli.common.arguments.CompilerArguments; import org.jetbrains.jet.cli.common.messages.*; import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentException; import org.jetbrains.jet.config.CompilerConfiguration; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java index 571fd626970..4f2a73f0244 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java @@ -31,6 +31,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.cli.common.CLICompiler; import org.jetbrains.jet.cli.common.ExitCode; +import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jet.cli.common.messages.AnalyzerWithCompilerReport; import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java index 85edf64b433..8d3e548b5c9 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java @@ -24,6 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.CLICompiler; import org.jetbrains.jet.cli.common.CLIConfigurationKeys; import org.jetbrains.jet.cli.common.ExitCode; +import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jet.cli.common.messages.*; import org.jetbrains.jet.cli.jvm.compiler.*; import org.jetbrains.jet.cli.jvm.repl.ReplFromTerminal; diff --git a/compiler/testData/cli/help.out b/compiler/testData/cli/help.out index 2c4b0a04099..c302ec0c782 100644 --- a/compiler/testData/cli/help.out +++ b/compiler/testData/cli/help.out @@ -1,4 +1,4 @@ -Usage: org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments +Usage: org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments -jar [String] jar file name -src [String] source file or directory (allows many paths separated by the system path separator) -classpath [String] classpath to use when compiling diff --git a/compiler/testData/cli/wrongArgument.out b/compiler/testData/cli/wrongArgument.out index 89099b86cd9..2635874864b 100644 --- a/compiler/testData/cli/wrongArgument.out +++ b/compiler/testData/cli/wrongArgument.out @@ -1,5 +1,5 @@ Invalid argument: -wrongArgument -Usage: org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments +Usage: org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments -jar [String] jar file name -src [String] source file or directory (allows many paths separated by the system path separator) -classpath [String] classpath to use when compiling diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CompileMavenGeneratedJSLibrary.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/CompileMavenGeneratedJSLibrary.java index 61ec3ca41e3..dfb0184aee7 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CompileMavenGeneratedJSLibrary.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/CompileMavenGeneratedJSLibrary.java @@ -21,7 +21,7 @@ import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.ExitCode; import org.jetbrains.jet.cli.js.K2JSCompiler; -import org.jetbrains.jet.cli.js.K2JSCompilerArguments; +import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.k2js.config.EcmaVersion; import org.jetbrains.k2js.test.SingleFileTranslationTest; diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java index 36510df52fc..839f7631751 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java @@ -22,7 +22,7 @@ import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.ExitCode; import org.jetbrains.jet.cli.js.K2JSCompiler; -import org.jetbrains.jet.cli.js.K2JSCompilerArguments; +import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.k2js.config.EcmaVersion; import org.jetbrains.k2js.test.SingleFileTranslationTest; import org.jetbrains.k2js.test.utils.LibraryFilePathsUtil; diff --git a/libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java b/libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java index 0fca3816311..ab49aaebad3 100644 --- a/libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java +++ b/libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.maven.doc; import org.apache.maven.plugin.MojoExecutionException; -import org.jetbrains.jet.cli.common.CompilerArguments; -import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments; +import org.jetbrains.jet.cli.common.arguments.CompilerArguments; +import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jet.cli.jvm.K2JVMCompiler; import org.jetbrains.kotlin.doc.KDocArguments; import org.jetbrains.kotlin.doc.KDocCompiler; diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt index 25101a30ad4..f1b226f6be5 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt @@ -3,8 +3,8 @@ package org.jetbrains.kotlin.doc import java.io.PrintStream import org.jetbrains.jet.cli.common.CLICompiler import org.jetbrains.jet.cli.common.CLIConfigurationKeys +import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jet.cli.jvm.K2JVMCompiler -import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments import org.jetbrains.jet.config.CompilerConfiguration /** diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt index e6e91788e4a..a2bd854e218 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt @@ -3,7 +3,7 @@ package test.kotlin.kdoc import java.io.File import kotlin.test.assertTrue import org.jetbrains.jet.cli.jvm.K2JVMCompiler -import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments +import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.kotlin.doc.highlighter.HtmlCompilerPlugin import org.junit.Test diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index e083583120d..598ea13f5c3 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -24,7 +24,7 @@ import org.gradle.api.internal.DefaultDomainObjectSet import com.android.build.gradle.api.BaseVariant import com.android.build.gradle.api.AndroidSourceSet import org.gradle.api.plugins.ExtensionAware -import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments +import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; import java.util.ArrayList import com.android.build.gradle.BasePlugin import com.android.build.gradle.api.LibraryVariant 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 f517e3c5c0c..be3510e09fa 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 @@ -1,8 +1,6 @@ package org.jetbrains.kotlin.gradle.tasks import org.gradle.api.tasks.compile.AbstractCompile -import org.jetbrains.jet.cli.jvm.K2JVMCompiler -import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments import org.jetbrains.kotlin.gradle.plugin.KSpec import java.io.File import org.gradle.api.GradleException @@ -16,6 +14,8 @@ import org.gradle.api.tasks.TaskAction import org.gradle.api.file.SourceDirectorySet import java.util.ArrayList import org.apache.commons.io.FilenameUtils +import org.jetbrains.jet.cli.jvm.K2JVMCompiler +import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jet.cli.common.messages.MessageCollector import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java index 8a6c4a5229c..ac66b540302 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java @@ -21,9 +21,9 @@ import com.google.common.io.InputSupplier; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.jetbrains.jet.cli.common.CLICompiler; -import org.jetbrains.jet.cli.common.CompilerArguments; +import org.jetbrains.jet.cli.common.arguments.CompilerArguments; +import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jet.cli.js.K2JSCompiler; -import org.jetbrains.jet.cli.js.K2JSCompilerArguments; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.k2js.config.MetaInfServices; diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojo.java index 3d4ca9539c1..760d106fb0b 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojo.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.maven; import org.apache.maven.plugin.MojoExecutionException; -import org.jetbrains.jet.cli.common.CompilerArguments; -import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments; +import org.jetbrains.jet.cli.common.arguments.CompilerArguments; +import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; /** * Compiles kotlin sources diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java index 8275592471d..8f4d97bcf46 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java @@ -26,14 +26,14 @@ import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.CLICompiler; -import org.jetbrains.jet.cli.common.CompilerArguments; import org.jetbrains.jet.cli.common.ExitCode; import org.jetbrains.jet.cli.common.KotlinVersion; import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.jet.cli.common.messages.MessageCollector; +import org.jetbrains.jet.cli.common.arguments.CompilerArguments; +import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jet.cli.jvm.K2JVMCompiler; -import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments; import java.io.File; import java.io.IOException; diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java index 98f6a75309d..6d13b88b68c 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.maven; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.jetbrains.jet.cli.common.CompilerArguments; -import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments; +import org.jetbrains.jet.cli.common.arguments.CompilerArguments; +import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; import java.util.List;