Avoid having -d and -module set at the same time
#KT-14619 fixed
This commit is contained in:
+3
@@ -4,6 +4,8 @@ import org.jetbrains.kotlin.gradle.util.getFileByName
|
||||
import org.jetbrains.kotlin.gradle.util.modify
|
||||
import org.junit.Test
|
||||
|
||||
val DIR_AND_MODULE_ERROR_MESSAGE = "'-d' option with a directory destination is ignored because '-module' is specified"
|
||||
|
||||
class ExecutionStrategyJsIT : ExecutionStrategyIT() {
|
||||
override fun setupProject(project: Project) {
|
||||
project.setupWorkingDir()
|
||||
@@ -48,6 +50,7 @@ open class ExecutionStrategyIT : BaseGradleIT() {
|
||||
assertSuccessful()
|
||||
assertContains(finishMessage)
|
||||
checkOutput()
|
||||
assertNotContains(DIR_AND_MODULE_ERROR_MESSAGE)
|
||||
}
|
||||
|
||||
val fKt = project.projectDir.getFileByName("f.kt")
|
||||
|
||||
+1
@@ -191,6 +191,7 @@ class KotlinGradleIT: BaseGradleIT() {
|
||||
assertReportExists("projB")
|
||||
assertContains(":projB:compileKotlin")
|
||||
assertNotContains("projB:compileKotlin UP-TO-DATE")
|
||||
assertNotContains(DIR_AND_MODULE_ERROR_MESSAGE)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-3
@@ -58,17 +58,16 @@ 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 = outputDir,
|
||||
outputDir = args.destinationAsFile,
|
||||
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)
|
||||
|
||||
Reference in New Issue
Block a user