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

[Gradle][Minor] Rename IdeArtifactResolutionQuerySourcesAndDocumentationResolver to IdeArtifactResolutionQuerySourcesResolver

Browse Source 
^KT-59595 Verification Pending
This commit is contained in:
Sebastian Sellmair
2023-07-17 10:07:43 +02:00
committed by Space Team
parent e5ac2f2788
commit f47b2f404f
3 changed files with 5 additions and 5 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
+1 -1
View File
@@ -127,7 +127,7 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti
if (extension.project.kotlinPropertiesProvider.enableSlowIdeSourcesJarResolver) { if (extension.project.kotlinPropertiesProvider.enableSlowIdeSourcesJarResolver) {
registerAdditionalArtifactResolver( registerAdditionalArtifactResolver(
resolver = IdeArtifactResolutionQuerySourcesAndDocumentationResolver, resolver = IdeArtifactResolutionQuerySourcesResolver,
constraint = SourceSetConstraint.unconstrained, constraint = SourceSetConstraint.unconstrained,
phase = IdeMultiplatformImport.AdditionalArtifactResolutionPhase.SourcesAndDocumentationResolution, phase = IdeMultiplatformImport.AdditionalArtifactResolutionPhase.SourcesAndDocumentationResolution,
priority = IdeMultiplatformImport.Priority.normal priority = IdeMultiplatformImport.Priority.normal
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeArtifactResolutionQuerySourcesAndDocumentationResolver.kt → libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeArtifactResolutionQuerySourcesResolver.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.gradle.plugin.sources.internal
* *
* cc Anton Lakotka, Sebastian Sellmair * cc Anton Lakotka, Sebastian Sellmair
*/ */
internal object IdeArtifactResolutionQuerySourcesAndDocumentationResolver : IdeAdditionalArtifactResolver { internal object IdeArtifactResolutionQuerySourcesResolver : IdeAdditionalArtifactResolver {
override fun resolve(sourceSet: KotlinSourceSet, dependencies: Set<IdeaKotlinDependency>) { override fun resolve(sourceSet: KotlinSourceSet, dependencies: Set<IdeaKotlinDependency>) {
val binaryDependencies = dependencies.filterIsInstance<IdeaKotlinResolvedBinaryDependency>() val binaryDependencies = dependencies.filterIsInstance<IdeaKotlinResolvedBinaryDependency>()
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeAndroidDependencyResolutionTest.kt
+3 -3
View File
@@ -10,7 +10,7 @@ package org.jetbrains.kotlin.gradle.dependencyResolutionTests.tcs
import org.jetbrains.kotlin.gradle.dependencyResolutionTests.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.dependencyResolutionTests.mavenCentralCacheRedirector
import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinBinaryDependency 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.kotlinIdeMultiplatformImport
import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImportStatistics import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImportStatistics
import org.jetbrains.kotlin.gradle.util.* import org.jetbrains.kotlin.gradle.util.*
@@ -68,10 +68,10 @@ class IdeAndroidDependencyResolutionTest {
androidSourceSets.forEach { sourceSet -> androidSourceSets.forEach { sourceSet ->
project.kotlinIdeMultiplatformImport.resolveDependencies(sourceSet) project.kotlinIdeMultiplatformImport.resolveDependencies(sourceSet)
if ( if (
IdeArtifactResolutionQuerySourcesAndDocumentationResolver::class.java in IdeArtifactResolutionQuerySourcesResolver::class.java in
project.kotlinIdeMultiplatformImportStatistics.getExecutionTimes() project.kotlinIdeMultiplatformImportStatistics.getExecutionTimes()
) { ) {
fail("${IdeArtifactResolutionQuerySourcesAndDocumentationResolver::class.simpleName} as executed on ${sourceSet.name}") fail("${IdeArtifactResolutionQuerySourcesResolver::class.simpleName} as executed on ${sourceSet.name}")
} }
} }
} }