diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt index 5860bc43fcd..6f931e8627c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt @@ -127,7 +127,7 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti if (extension.project.kotlinPropertiesProvider.enableSlowIdeSourcesJarResolver) { registerAdditionalArtifactResolver( - resolver = IdeArtifactResolutionQuerySourcesAndDocumentationResolver, + resolver = IdeArtifactResolutionQuerySourcesResolver, constraint = SourceSetConstraint.unconstrained, phase = IdeMultiplatformImport.AdditionalArtifactResolutionPhase.SourcesAndDocumentationResolution, priority = IdeMultiplatformImport.Priority.normal diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeArtifactResolutionQuerySourcesAndDocumentationResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeArtifactResolutionQuerySourcesResolver.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeArtifactResolutionQuerySourcesAndDocumentationResolver.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeArtifactResolutionQuerySourcesResolver.kt index 6073cc79687..5bd54b0f270 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeArtifactResolutionQuerySourcesAndDocumentationResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeArtifactResolutionQuerySourcesResolver.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.gradle.plugin.sources.internal * * cc Anton Lakotka, Sebastian Sellmair */ -internal object IdeArtifactResolutionQuerySourcesAndDocumentationResolver : IdeAdditionalArtifactResolver { +internal object IdeArtifactResolutionQuerySourcesResolver : IdeAdditionalArtifactResolver { override fun resolve(sourceSet: KotlinSourceSet, dependencies: Set) { val binaryDependencies = dependencies.filterIsInstance() diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeAndroidDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeAndroidDependencyResolutionTest.kt index fc3a78a762c..57cb9ebcf60 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeAndroidDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeAndroidDependencyResolutionTest.kt @@ -10,7 +10,7 @@ package org.jetbrains.kotlin.gradle.dependencyResolutionTests.tcs import org.jetbrains.kotlin.gradle.dependencyResolutionTests.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinBinaryDependency -import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeArtifactResolutionQuerySourcesAndDocumentationResolver +import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeArtifactResolutionQuerySourcesResolver import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImportStatistics import org.jetbrains.kotlin.gradle.util.* @@ -68,10 +68,10 @@ class IdeAndroidDependencyResolutionTest { androidSourceSets.forEach { sourceSet -> project.kotlinIdeMultiplatformImport.resolveDependencies(sourceSet) if ( - IdeArtifactResolutionQuerySourcesAndDocumentationResolver::class.java in + IdeArtifactResolutionQuerySourcesResolver::class.java in project.kotlinIdeMultiplatformImportStatistics.getExecutionTimes() ) { - fail("${IdeArtifactResolutionQuerySourcesAndDocumentationResolver::class.simpleName} as executed on ${sourceSet.name}") + fail("${IdeArtifactResolutionQuerySourcesResolver::class.simpleName} as executed on ${sourceSet.name}") } } }