Revert "Avoid having -d and -module set at the same time"

This reverts commit ac241e267648e9344d718c3a44446c6e13d8d2e4.
This commit is contained in:
Alexey Tsvetkov
2017-01-31 19:05:56 +03:00
parent 2d88419c38
commit de24e68adc
6 changed files with 6 additions and 15 deletions
@@ -58,16 +58,17 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
args: K2JVMCompilerArguments,
environment: GradleCompilerEnvironment
): ExitCode {
val outputDir = args.destinationAsFile
val moduleFile = makeModuleFile(
args.moduleName,
isTest = false,
outputDir = args.destinationAsFile,
outputDir = outputDir,
sourcesToCompile = sourcesToCompile,
javaSourceRoots = javaSourceRoots,
classpath = args.classpathAsList,
friendDirs = args.friendPaths?.map(::File) ?: emptyList())
args.module = moduleFile.absolutePath
args.destination = null
try {
return runCompiler(K2JVM_COMPILER, args, environment)