[Gradle][MPP] Rename JarMetadataProvider to ArtifactMetadataProvider

^KT-48135 Verification Pending

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMetadataBinaryDependencyResolver.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea
 
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier
 import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets
-import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.JarMetadataProvider
+import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ArtifactMetadataProvider
 import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ProjectMetadataProvider
 import org.jetbrains.kotlin.gradle.plugin.mpp.kotlinTransformedMetadataLibraryDirectoryForIde
 import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment
@@ -32,7 +32,7 @@ internal class IdeaKpmMetadataBinaryDependencyResolver(
         /* Project to project metadata dependencies shall be resolved as source dependencies, somewhere else */
         val metadataProvider = when (resolution.metadataProvider) {
             is ProjectMetadataProvider -> return emptySet()
-            is JarMetadataProvider -> resolution.metadataProvider
+            is ArtifactMetadataProvider -> resolution.metadataProvider
         }
 
         return metadataProvider.read { artifactHandle ->

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

@@ -16,7 +16,7 @@ import org.gradle.api.file.FileCollection
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
-import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.JarMetadataProvider
+import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ArtifactMetadataProvider
 import org.jetbrains.kotlin.gradle.plugin.sources.KotlinDependencyScope
 import org.jetbrains.kotlin.gradle.plugin.sources.sourceSetDependencyConfigurationByScope
 import org.jetbrains.kotlin.gradle.targets.metadata.ALL_COMPILE_METADATA_CONFIGURATION_NAME
@@ -80,7 +80,7 @@ internal sealed class MetadataDependencyResolution(
     ) : MetadataDependencyResolution(dependency, projectDependency) {
 
         internal sealed class MetadataProvider {
-            class JarMetadataProvider(private val compositeMetadataArtifact: CompositeMetadataArtifact) :
+            class ArtifactMetadataProvider(private val compositeMetadataArtifact: CompositeMetadataArtifact) :
                 MetadataProvider(), CompositeMetadataArtifact by compositeMetadataArtifact
 
             abstract class ProjectMetadataProvider : MetadataProvider() {
@@ -274,7 +274,7 @@ internal class GranularMetadataTransformation(
                 moduleIdentifier = mppDependencyMetadataExtractor.moduleIdentifier
             )
 
-            is JarMppDependencyProjectStructureMetadataExtractor -> JarMetadataProvider(
+            is JarMppDependencyProjectStructureMetadataExtractor -> ArtifactMetadataProvider(
                 CompositeMetadataArtifactImpl(
                     moduleDependencyIdentifier = ModuleIds.fromComponent(project, module),
                     moduleDependencyVersion = module.moduleVersion?.version ?: "unspecified",

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragmentGranularMetadataResolver.kt

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.pm20
 import org.gradle.api.Project
 import org.gradle.api.artifacts.result.ResolvedDependencyResult
 import org.jetbrains.kotlin.gradle.plugin.mpp.*
-import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.JarMetadataProvider
+import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ArtifactMetadataProvider
 import org.jetbrains.kotlin.project.model.*
 import org.jetbrains.kotlin.utils.addToStdlib.flattenTo
 import java.io.File
@@ -109,7 +109,7 @@ internal class GradleKpmFragmentGranularMetadataResolver(
                             moduleIdentifier = projectStructureMetadataExtractor.moduleIdentifier
                         )
 
-                        is JarMppDependencyProjectStructureMetadataExtractor -> JarMetadataProvider(
+                        is JarMppDependencyProjectStructureMetadataExtractor -> ArtifactMetadataProvider(
                             CompositeMetadataArtifactImpl(
                                 moduleDependencyIdentifier = ModuleIds.fromComponent(project, metadataSourceComponent),
                                 moduleDependencyVersion = metadataSourceComponent.moduleVersion?.version ?: "unspecified",

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

@@ -6,7 +6,7 @@
 package org.jetbrains.kotlin.gradle.plugin.mpp
 
 import org.gradle.api.Project
-import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.JarMetadataProvider
+import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ArtifactMetadataProvider
 import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ProjectMetadataProvider
 import java.io.File
 
@@ -25,7 +25,7 @@ internal fun Project.transformMetadataLibrariesForIde(
             metadataProvider.getSourceSetCompiledMetadata(visibleSourceSetName)
         }
 
-        is JarMetadataProvider -> transformMetadataLibrariesForIde(
+        is ArtifactMetadataProvider -> transformMetadataLibrariesForIde(
             kotlinTransformedMetadataLibraryDirectoryForIde, resolution, metadataProvider
         )
     }
@@ -47,7 +47,7 @@ internal fun Project.transformMetadataLibrariesForBuild(
             }
         )
 
-        is JarMetadataProvider -> transformMetadataLibrariesForBuild(
+        is ArtifactMetadataProvider -> transformMetadataLibrariesForBuild(
             resolution, outputDirectory, materializeFiles, resolution.metadataProvider
         )
     }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropMetadataDependencyClasspath.kt

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.targets.native.internal
 import org.gradle.api.Project
 import org.gradle.api.file.FileCollection
 import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets
-import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.JarMetadataProvider
+import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ArtifactMetadataProvider
 import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ProjectMetadataProvider
 import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ProjectMetadataProvider.MetadataConsumer.Cli
 import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ProjectMetadataProvider.MetadataConsumer.Ide
@@ -56,7 +56,7 @@ private fun Project.createCInteropMetadataDependencyClasspathFromProjectDependen
                 /* We only want to access resolutions that provide metadata from dependency projects */
                 val projectMetadataProvider = when (chooseVisibleSourceSets.metadataProvider) {
                     is ProjectMetadataProvider -> chooseVisibleSourceSets.metadataProvider
-                    is JarMetadataProvider -> return@flatMap emptyList()
+                    is ArtifactMetadataProvider -> return@flatMap emptyList()
                 }
 
                 chooseVisibleSourceSets.visibleSourceSetsProvidingCInterops.map { visibleSourceSetName ->

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropMetadataDependencyTransformationTask.kt

@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.gradle.plugin.ide.Idea222Api
 import org.jetbrains.kotlin.gradle.plugin.ide.ideaImportDependsOn
 import org.jetbrains.kotlin.gradle.plugin.mpp.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets
-import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.JarMetadataProvider
+import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ArtifactMetadataProvider
 import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ProjectMetadataProvider
 import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.toKpmModuleIdentifiers
 import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet
@@ -136,7 +136,7 @@ internal open class CInteropMetadataDependencyTransformationTask @Inject constru
         object Precise : OutputLibraryFilesDiscovery() {
             override fun resolveOutputLibraryFiles(outputDirectory: File, resolutions: Iterable<ChooseVisibleSourceSets>): Set<File> {
                 return resolutions.flatMap { chooseVisibleSourceSets ->
-                    if (chooseVisibleSourceSets.metadataProvider !is JarMetadataProvider) return@flatMap emptyList()
+                    if (chooseVisibleSourceSets.metadataProvider !is ArtifactMetadataProvider) return@flatMap emptyList()
                     chooseVisibleSourceSets.metadataProvider.read { artifactHandle ->
                         chooseVisibleSourceSets.visibleSourceSetsProvidingCInterops
                             .mapNotNull { visibleSourceSetName -> artifactHandle.findSourceSet(visibleSourceSetName) }
@@ -211,7 +211,7 @@ internal open class CInteropMetadataDependencyTransformationTask @Inject constru
         is ProjectMetadataProvider -> Unit
 
         /* Extract/Materialize all cinterop files from composite jar file */
-        is JarMetadataProvider -> chooseVisibleSourceSets.metadataProvider.read { artifactHandle ->
+        is ArtifactMetadataProvider -> chooseVisibleSourceSets.metadataProvider.read { artifactHandle ->
             chooseVisibleSourceSets.visibleSourceSetsProvidingCInterops
                 .mapNotNull { visibleSourceSetName -> artifactHandle.findSourceSet(visibleSourceSetName) }
                 .flatMap { sourceSet -> sourceSet.cinteropMetadataLibraries }