From adf65169867a4b7435099bda1c03640c12b7c143 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Thu, 1 Dec 2022 16:24:22 +0100 Subject: [PATCH] [Gradle] Make 'isIdeaProjectLevel' opt-out instead of opt-in KT-55218 --- .../kotlin/gradle/idea/tcs/extras/primitiveExtras.kt | 2 +- .../IdeNativePlatformDependencyResolver.kt | 1 - .../IdeNativeStdlibDependencyResolver.kt | 2 -- .../IdeTransformedMetadataDependencyResolver.kt | 6 +----- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/primitiveExtras.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/primitiveExtras.kt index be9c9ca3e3e..62bf3b610bc 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/primitiveExtras.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/primitiveExtras.kt @@ -15,7 +15,7 @@ val isIdeaProjectLevelKey = extrasKeyOf("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("isNativeDistribution") diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeNativePlatformDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeNativePlatformDependencyResolver.kt index dc6e005fb22..66f00e16cc6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeNativePlatformDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeNativePlatformDependencyResolver.kt @@ -58,7 +58,6 @@ object IdeNativePlatformDependencyResolver : IdeDependencyResolver { sourceSetName = konanTarget.toString() ), ).apply { - isIdeaProjectLevel = true isNativeDistribution = true klibExtra = KlibExtra(kotlinLibrary) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeNativeStdlibDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeNativeStdlibDependencyResolver.kt index 0e3342423fe..d4a95b76552 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeNativeStdlibDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeNativeStdlibDependencyResolver.kt @@ -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 } ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeTransformedMetadataDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeTransformedMetadataDependencyResolver.kt index 08b04f87614..972236d367a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeTransformedMetadataDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeTransformedMetadataDependencyResolver.kt @@ -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 - } + ) } } }