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

This reverts commit ac241e267648e9344d718c3a44446c6e13d8d2e4.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt

@@ -4,8 +4,6 @@ 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()
@@ -50,7 +48,6 @@ open class ExecutionStrategyIT : BaseGradleIT() {
             assertSuccessful()
             assertContains(finishMessage)
             checkOutput()
-            assertNotContains(DIR_AND_MODULE_ERROR_MESSAGE)
         }
 
         val fKt = project.projectDir.getFileByName("f.kt")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt

@@ -191,7 +191,6 @@ class KotlinGradleIT: BaseGradleIT() {
             assertReportExists("projB")
             assertContains(":projB:compileKotlin")
             assertNotContains("projB:compileKotlin UP-TO-DATE")
-            assertNotContains(DIR_AND_MODULE_ERROR_MESSAGE)
         }
     }
 

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt

@@ -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)