[Gradle] Make 'isIdeaProjectLevel' opt-out instead of opt-in

KT-55218
This commit is contained in:
Sebastian Sellmair
2022-12-01 16:24:22 +01:00
committed by Space Team
parent ba68977f52
commit adf6516986
4 changed files with 2 additions and 9 deletions
@@ -15,7 +15,7 @@ val isIdeaProjectLevelKey = extrasKeyOf<Boolean>("isIdeaProjectLevel")
* Marks any binary dependency as Global in the sense of "this library is considered
* the same, no matter in which Gradle project / IntelliJ module it will be used
*/
var IdeaKotlinBinaryDependency.isIdeaProjectLevel by isIdeaProjectLevelKey.readWriteProperty.notNull(false)
var IdeaKotlinBinaryDependency.isIdeaProjectLevel by isIdeaProjectLevelKey.readWriteProperty.notNull(true)
val isNativeDistributionKey = extrasKeyOf<Boolean>("isNativeDistribution")
@@ -58,7 +58,6 @@ object IdeNativePlatformDependencyResolver : IdeDependencyResolver {
sourceSetName = konanTarget.toString()
),
).apply {
isIdeaProjectLevel = true
isNativeDistribution = true
klibExtra = KlibExtra(kotlinLibrary)
}
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.compilerRunner.konanVersion
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinBinaryCoordinates
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency
import org.jetbrains.kotlin.gradle.idea.tcs.extras.isIdeaProjectLevel
import org.jetbrains.kotlin.gradle.idea.tcs.extras.isNativeDistribution
import org.jetbrains.kotlin.gradle.idea.tcs.extras.isNativeStdlib
import org.jetbrains.kotlin.gradle.idea.tcs.extras.klibExtra
@@ -54,7 +53,6 @@ internal object IdeNativeStdlibDependencyResolver : IdeDependencyResolver {
).apply {
this.isNativeDistribution = true
this.isNativeStdlib = true
this.isIdeaProjectLevel = true
this.klibExtra = klibExtra
}
)
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinBinaryCoordinates
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency
import org.jetbrains.kotlin.gradle.idea.tcs.extras.isIdeaProjectLevel
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.ide.IdeDependencyResolver
import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets
@@ -50,10 +49,7 @@ internal object IdeTransformedMetadataDependencyResolver : IdeDependencyResolver
version = metadataProvider.moduleDependencyVersion,
sourceSetName = visibleSourceSet
)
).apply {
/* Those libraries are stored in project wide .gradle and are scoped by hash */
isIdeaProjectLevel = true
}
)
}
}
}