azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] IdeMultiplatformImportFactory: Empty overwrite for Android AdditionalArtifactResolutionPhase.SourcesAndDocumentationResolution

Browse Source 
^KT-56430 Verification Pending
This commit is contained in:
Sebastian Sellmair
2023-02-06 09:57:45 +01:00
committed by Space Team
parent 7341f37838
commit 3a9ca1c1eb
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt
+10 -3
View File
@@ -39,7 +39,7 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti
registerDependencyResolver( registerDependencyResolver(
resolver = IdeJvmAndAndroidSourceDependencyResolver, resolver = IdeJvmAndAndroidSourceDependencyResolver,
constraint = SourceSetConstraint.unconstrained, constraint = SourceSetConstraint.isJvmAndAndroid,
phase = IdeMultiplatformImport.DependencyResolutionPhase.SourceDependencyResolution, phase = IdeMultiplatformImport.DependencyResolutionPhase.SourceDependencyResolution,
level = IdeMultiplatformImport.DependencyResolutionLevel.Default level = IdeMultiplatformImport.DependencyResolutionLevel.Default
) )
@@ -135,7 +135,7 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti
registerAdditionalArtifactResolver( registerAdditionalArtifactResolver(
resolver = IdeMetadataSourcesResolver(), resolver = IdeMetadataSourcesResolver(),
constraint = !SourceSetConstraint.isSinglePlatformType, constraint = !SourceSetConstraint.isSinglePlatformType,
phase = IdeMultiplatformImport.AdditionalArtifactResolutionPhase.SourcesAndJavadocArtifactResolution, phase = IdeMultiplatformImport.AdditionalArtifactResolutionPhase.SourcesAndDocumentationResolution,
level = IdeMultiplatformImport.AdditionalArtifactResolutionLevel.Default level = IdeMultiplatformImport.AdditionalArtifactResolutionLevel.Default
) )
@@ -143,7 +143,7 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti
registerAdditionalArtifactResolver( registerAdditionalArtifactResolver(
resolver = IdeArtifactResolutionQuerySourcesAndDocumentationResolver, resolver = IdeArtifactResolutionQuerySourcesAndDocumentationResolver,
constraint = SourceSetConstraint.unconstrained, constraint = SourceSetConstraint.unconstrained,
phase = IdeMultiplatformImport.AdditionalArtifactResolutionPhase.SourcesAndJavadocArtifactResolution, phase = IdeMultiplatformImport.AdditionalArtifactResolutionPhase.SourcesAndDocumentationResolution,
level = IdeMultiplatformImport.AdditionalArtifactResolutionLevel.Default level = IdeMultiplatformImport.AdditionalArtifactResolutionLevel.Default
) )
} }
@@ -175,5 +175,12 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti
phase = IdeMultiplatformImport.DependencyResolutionPhase.SourcesAndDocumentationResolution, phase = IdeMultiplatformImport.DependencyResolutionPhase.SourcesAndDocumentationResolution,
level = IdeMultiplatformImport.DependencyResolutionLevel.Overwrite level = IdeMultiplatformImport.DependencyResolutionLevel.Overwrite
) )
registerAdditionalArtifactResolver(
resolver = IdeAdditionalArtifactResolver.Empty,
constraint = SourceSetConstraint.isAndroid,
phase = IdeMultiplatformImport.AdditionalArtifactResolutionPhase.SourcesAndDocumentationResolution,
level = IdeMultiplatformImport.AdditionalArtifactResolutionLevel.Overwrite
)
} }
} }