diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt index 7b0e8b089a7..01975583874 100644 --- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt +++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt @@ -525,7 +525,6 @@ class CompileServiceImpl( } } - // todo: non-IC non-KTS scripts? private fun execIncrementalCompiler( k2jvmArgs: K2JVMCompilerArguments, incrementalCompilationOptions: IncrementalCompilationOptions, diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt index 59a9e287dbf..4473b49fccf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt @@ -124,10 +124,19 @@ class SubpluginsIT : BaseGradleIT() { } } + @Test + fun testScriptingCustomExtensionNonIncremental() { + testScriptingCustomExtensionImpl(withIC = false) + } + @Test fun testScriptingCustomExtensionIncremental() { + testScriptingCustomExtensionImpl(withIC = true) + } + + private fun testScriptingCustomExtensionImpl(withIC: Boolean) { val project = Project("scriptingCustomExtension") - val options = defaultBuildOptions().copy(incremental = true, kotlinDaemonDebugPort = null) + val options = defaultBuildOptions().copy(incremental = withIC) project.setupWorkingDir() val bobGreet = project.projectFile("bob.greet") @@ -137,17 +146,24 @@ class SubpluginsIT : BaseGradleIT() { project.build("build", options = options) { assertSuccessful() - assertCompiledKotlinSources(project.relativize(bobGreet, aliceGreet, worldGreet, greetScriptTemplateKt)) val classesDir = kotlinClassesDir("app", "main") assertFileExists("${classesDir}World.class") assertFileExists("${classesDir}Alice.class") assertFileExists("${classesDir}Bob.class") + + if (withIC) { + // compile iterations are not logged when IC is disabled + assertCompiledKotlinSources(project.relativize(bobGreet, aliceGreet, worldGreet, greetScriptTemplateKt)) + } } bobGreet.modify { it.replace("Bob", "Uncle Bob") } project.build("build", options = options) { assertSuccessful() - assertCompiledKotlinSources(project.relativize(bobGreet)) + + if (withIC) { + assertCompiledKotlinSources(project.relativize(bobGreet)) + } } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt index b8d4af8ff77..09565f9b3eb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt @@ -76,11 +76,6 @@ internal open class GradleCompilerRunner(protected val task: Task) { args.commonSources = commonSources.map { it.absolutePath }.toTypedArray() args.javaSourceRoots = javaSourceRoots.map { it.absolutePath }.toTypedArray() args.javaPackagePrefix = javaPackagePrefix - - if (environment.incrementalCompilationEnvironment == null || kotlinCompilerExecutionStrategy() != DAEMON_EXECUTION_STRATEGY) { - args.destination = null - } - runCompilerAsync(KotlinCompilerClass.JVM, args, environment) }