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 824c9444ac0..aa8927915c6 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 @@ -39,7 +39,7 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti registerDependencyResolver( resolver = IdeJvmAndAndroidSourceDependencyResolver, - constraint = SourceSetConstraint.unconstrained, + constraint = SourceSetConstraint.isJvmAndAndroid, phase = IdeMultiplatformImport.DependencyResolutionPhase.SourceDependencyResolution, level = IdeMultiplatformImport.DependencyResolutionLevel.Default ) @@ -135,7 +135,7 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti registerAdditionalArtifactResolver( resolver = IdeMetadataSourcesResolver(), constraint = !SourceSetConstraint.isSinglePlatformType, - phase = IdeMultiplatformImport.AdditionalArtifactResolutionPhase.SourcesAndJavadocArtifactResolution, + phase = IdeMultiplatformImport.AdditionalArtifactResolutionPhase.SourcesAndDocumentationResolution, level = IdeMultiplatformImport.AdditionalArtifactResolutionLevel.Default ) @@ -143,7 +143,7 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti registerAdditionalArtifactResolver( resolver = IdeArtifactResolutionQuerySourcesAndDocumentationResolver, constraint = SourceSetConstraint.unconstrained, - phase = IdeMultiplatformImport.AdditionalArtifactResolutionPhase.SourcesAndJavadocArtifactResolution, + phase = IdeMultiplatformImport.AdditionalArtifactResolutionPhase.SourcesAndDocumentationResolution, level = IdeMultiplatformImport.AdditionalArtifactResolutionLevel.Default ) } @@ -175,5 +175,12 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti phase = IdeMultiplatformImport.DependencyResolutionPhase.SourcesAndDocumentationResolution, level = IdeMultiplatformImport.DependencyResolutionLevel.Overwrite ) + + registerAdditionalArtifactResolver( + resolver = IdeAdditionalArtifactResolver.Empty, + constraint = SourceSetConstraint.isAndroid, + phase = IdeMultiplatformImport.AdditionalArtifactResolutionPhase.SourcesAndDocumentationResolution, + level = IdeMultiplatformImport.AdditionalArtifactResolutionLevel.Overwrite + ) } }