[Gradle] KotlinCompilerArgumentsProducer: Merge PluginClasspath & DependencyClasspath

KTIJ-24976

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentAware.kt

@@ -83,6 +83,5 @@ interface CompilerArgumentAware<T : CommonToolArguments> : KotlinCompilerArgumen
 
 private val includedArgumentTypes = setOf(
     ArgumentType.Primitive,
-    ArgumentType.PluginClasspath,
+    ArgumentType.Classpath,
-    ArgumentType.DependencyClasspath,
 )

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt

@@ -126,15 +126,13 @@ abstract class KaptGenerateStubsTask @Inject constructor(
             args.destinationAsFile = destinationDirectory.get().asFile
         }
 
-        contribute(KotlinCompilerArgumentsProducer.ArgumentType.PluginClasspath) { args ->
+        contribute(KotlinCompilerArgumentsProducer.ArgumentType.Classpath) { args ->
             args.pluginClasspaths = tryLenient {
                 listOfNotNull(
                     pluginClasspath, kotlinPluginData?.orNull?.classpath
                 ).reduce(FileCollection::plus).toPathsArray()
             }
-        }
 
-        contribute(KotlinCompilerArgumentsProducer.ArgumentType.DependencyClasspath) { args ->
             args.classpathAsList = tryLenient { libraries.toList().filter { it.exists() } }.orEmpty()
             args.friendPaths = friendPaths.toPathsArray()
         }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilerArgumentsProducer.kt

@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.gradle.plugin
 
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments
 import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.ContributeCompilerArgumentsContext
@@ -17,8 +16,7 @@ interface KotlinCompilerArgumentsProducer {
 
     enum class ArgumentType {
         Primitive,
-        DependencyClasspath,
+        Classpath,
-        PluginClasspath,
         Sources;
 
         companion object {

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeCompilerArgumentsResolverImpl.kt

@@ -36,7 +36,7 @@ internal class IdeCompilerArgumentsResolverImpl(
                 isLenient = true,
                 includeArgumentTypes = setOfNotNull(
                     KotlinCompilerArgumentsProducer.ArgumentType.Primitive,
-                    KotlinCompilerArgumentsProducer.ArgumentType.DependencyClasspath
+                    KotlinCompilerArgumentsProducer.ArgumentType.Classpath
                         .takeIf { extension !is KotlinMultiplatformExtension }
                         .takeIf { producer is KotlinCompile }
                         .takeIf { !extension.project.hasAndroidPlugin }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt

@@ -226,11 +226,8 @@ constructor(
             KotlinCommonCompilerToolOptionsHelper.fillCompilerArguments(toolOptions, args)
         }
 
-        contribute(KotlinCompilerArgumentsProducer.ArgumentType.PluginClasspath) { args ->
+        contribute(KotlinCompilerArgumentsProducer.ArgumentType.Classpath) { args ->
             args.pluginClasspaths = compilerPlugins.flatMap { classpath -> tryLenient { classpath.files } ?: emptySet() }.toPathsArray()
-        }
-
-        contribute(KotlinCompilerArgumentsProducer.ArgumentType.DependencyClasspath) { args ->
             args.libraries = tryLenient { libraries.files.filterKlibsPassedToCompiler() }?.toPathsArray()
             args.exportedLibraries = tryLenient { exportLibraries.files.filterKlibsPassedToCompiler() }?.toPathsArray()
             args.friendModules = tryLenient { friendModule.files.toList().takeIf { it.isNotEmpty() } }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt

@@ -454,11 +454,9 @@ internal constructor(
             KotlinNativeCompilerOptionsHelper.fillCompilerArguments(compilerOptions, args)
         }
 
-        contribute(KotlinCompilerArgumentsProducer.ArgumentType.PluginClasspath) { args ->
+        contribute(KotlinCompilerArgumentsProducer.ArgumentType.Classpath) { args ->
             args.pluginClasspaths = compilerPlugins.flatMap { classpath -> tryLenient { classpath.files } ?: emptySet() }.toPathsArray()
-        }
 
-        contribute(KotlinCompilerArgumentsProducer.ArgumentType.DependencyClasspath) { args ->
             args.libraries = tryLenient { libraries.files.filterKlibsPassedToCompiler().toPathsArray() }
             args.friendModules = tryLenient {
                 friendModule.files.takeIf { it.isNotEmpty() }?.map { it.absolutePath }?.joinToString(File.pathSeparator)

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Kotlin2JsCompile.kt

@@ -172,15 +172,13 @@ abstract class Kotlin2JsCompile @Inject constructor(
             args.freeArgs = executionTimeFreeCompilerArgs ?: enhancedFreeCompilerArgs.get()
         }
 
-        contribute(KotlinCompilerArgumentsProducer.ArgumentType.PluginClasspath) { args ->
+        contribute(KotlinCompilerArgumentsProducer.ArgumentType.Classpath) { args ->
             args.pluginClasspaths = tryLenient {
                 listOfNotNull(
                     pluginClasspath, kotlinPluginData?.orNull?.classpath
                 ).reduce(FileCollection::plus).toPathsArray()
             }
-        }
 
-        contribute(KotlinCompilerArgumentsProducer.ArgumentType.DependencyClasspath) { args ->
             args.friendModules = friendDependencies.files.joinToString(File.pathSeparator) { it.absolutePath }
 
             args.libraries = tryLenient {

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompile.kt

@@ -252,15 +252,13 @@ abstract class KotlinCompile @Inject constructor(
             }
         }
 
-        contribute(ArgumentType.PluginClasspath) { args ->
+        contribute(ArgumentType.Classpath) { args ->
             args.pluginClasspaths = tryLenient {
                 listOfNotNull(
                     pluginClasspath, kotlinPluginData?.orNull?.classpath
                 ).reduce(FileCollection::plus).toPathsArray()
             }
-        }
 
-        contribute(ArgumentType.DependencyClasspath) { args ->
             args.friendPaths = friendPaths.toPathsArray()
             args.classpathAsList = tryLenient {
                 libraries.toList().filter { it.exists() }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt

@@ -93,15 +93,12 @@ abstract class KotlinCompileCommon @Inject constructor(
             }
         }
 
-        contribute(KotlinCompilerArgumentsProducer.ArgumentType.PluginClasspath) { args ->
+        contribute(KotlinCompilerArgumentsProducer.ArgumentType.Classpath) { args ->
             args.pluginClasspaths = tryLenient {
                 listOfNotNull(
                     pluginClasspath, kotlinPluginData?.orNull?.classpath
                 ).reduce(FileCollection::plus).toPathsArray()
             }
-        }
-
-        contribute(KotlinCompilerArgumentsProducer.ArgumentType.DependencyClasspath) { args ->
             args.classpath = tryLenient { libraries.files.filter { it.exists() }.joinToString(File.pathSeparator) }
             args.friendPaths = tryLenient { this@KotlinCompileCommon.friendPaths.files.toPathsArray() }
             args.refinesPaths = refinesMetadataPaths.toPathsArray()