diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentAware.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentAware.kt index 7e427ddf56a..be09253209f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentAware.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentAware.kt @@ -80,6 +80,5 @@ interface CompilerArgumentAware : KotlinCompilerArgumen private val includedArgumentTypes = setOf( ArgumentType.Primitive, - ArgumentType.DependencyClasspath, ArgumentType.PluginClasspath, ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/Kotlin2JsCompileArgumentsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/Kotlin2JsCompileArgumentsTest.kt index 2485c0b3993..f83eb8dd792 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/Kotlin2JsCompileArgumentsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/Kotlin2JsCompileArgumentsTest.kt @@ -35,7 +35,7 @@ class Kotlin2JsCompileArgumentsTest { val jsMainCompileTask = jsMainCompilation.compileTaskProvider.get() val argumentsFromCompilerArgumentsProducer = jsMainCompileTask.createCompilerArguments( CreateCompilerArgumentsContext( - includeArgumentTypes = setOf(Primitive, DependencyClasspath, PluginClasspath), + includeArgumentTypes = setOf(Primitive, PluginClasspath), isLenient = true ) ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinCompileArgumentsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinCompileArgumentsTest.kt index 9f26bb8095c..790e15b9eb8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinCompileArgumentsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinCompileArgumentsTest.kt @@ -50,7 +50,7 @@ class KotlinCompileArgumentsTest { val mainCompilationTask = mainCompilation.compileTaskProvider.get() as KotlinCompile val argumentsFromKotlinCompilerArgumentsAware = mainCompilationTask.createCompilerArguments( CreateCompilerArgumentsContext( - includeArgumentTypes = setOf(Primitive, DependencyClasspath, PluginClasspath), + includeArgumentTypes = setOf(Primitive, PluginClasspath), isLenient = true ) ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinNativeCompileArgumentsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinNativeCompileArgumentsTest.kt index 7a5c1de6fa8..30e1eedb863 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinNativeCompileArgumentsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinNativeCompileArgumentsTest.kt @@ -13,6 +13,10 @@ import org.jetbrains.kotlin.compilerRunner.ArgumentUtils import org.jetbrains.kotlin.gradle.dependencyResolutionTests.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension +import org.jetbrains.kotlin.gradle.plugin.CreateCompilerArgumentsContext +import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer +import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.ArgumentType.PluginClasspath +import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.ArgumentType.Primitive import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.CreateCompilerArgumentsContext.Companion.default import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.CreateCompilerArgumentsContext.Companion.lenient import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile @@ -52,7 +56,12 @@ class KotlinNativeCompileArgumentsTest { private fun `assert setupCompilerArgs and createCompilerArguments are equal`(compile: KotlinNativeCompile) { - val argumentsFromCompilerArgumentsProducer = compile.createCompilerArguments(lenient) + val argumentsFromCompilerArgumentsProducer = compile.createCompilerArguments( + CreateCompilerArgumentsContext( + includeArgumentTypes = setOf(Primitive, PluginClasspath), + isLenient = true + ) + ) val argumentsFromBuildCompilerArgs = K2NativeCompilerArguments().apply { @Suppress("DEPRECATION_ERROR") compile.setupCompilerArgs(this, false, true)