From 028780ae97d550604a83877d8d16f979c4f99e6e Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Fri, 10 Mar 2023 12:11:27 +0100 Subject: [PATCH] [Gradle] Introduce HasProject and implement HasMutableExtras in public entities ^KT-34662 Verification Pending --- .../api/kotlin-gradle-plugin-api.api | 12 +++++++----- .../tools/kotlin-gradle-plugin-api/build.gradle.kts | 2 +- .../org/jetbrains/kotlin/gradle/plugin/HasProject.kt | 12 ++++++++++++ .../kotlin/gradle/plugin/KotlinCompilation.kt | 5 +++-- .../kotlin/gradle/plugin/KotlinSourceSet.kt | 6 +++++- .../jetbrains/kotlin/gradle/plugin/KotlinTarget.kt | 5 ++--- .../kotlin/gradle/plugin/ide/IdeDependencyLogger.kt | 1 - .../gradle/plugin/ide/IdeMultiplatformImport.kt | 1 - ...ResolutionQuerySourcesAndDocumentationResolver.kt | 1 - .../IdeBinaryDependencyResolver.kt | 1 - .../IdeDependsOnDependencyResolver.kt | 1 - .../IdeJvmAndAndroidSourceDependencyResolver.kt | 1 - .../IdeMetadataSourcesResolver.kt | 1 - .../IdeNativeStdlibDependencyResolver.kt | 1 - .../IdePlatformSourcesResolver.kt | 1 - .../jetbrains/kotlin/gradle/plugin/ide/factories.kt | 1 - .../gradle/plugin/mpp/InternalKotlinCompilation.kt | 1 - .../gradle/plugin/sources/InternalKotlinSourceSet.kt | 7 +------ 18 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasProject.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api index 2963c292c91..801732d9279 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api +++ b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api @@ -672,6 +672,10 @@ public final class org/jetbrains/kotlin/gradle/plugin/HasKotlinDependenciesKt { public static final fun warnNpmGenerateExternals (Lorg/gradle/api/logging/Logger;)V } +public abstract interface class org/jetbrains/kotlin/gradle/plugin/HasProject { + public abstract fun getProject ()Lorg/gradle/api/Project; +} + public class org/jetbrains/kotlin/gradle/plugin/InternalSubpluginOption : org/jetbrains/kotlin/gradle/plugin/SubpluginOption { public fun (Ljava/lang/String;Ljava/lang/String;)V } @@ -689,7 +693,7 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinBasePlu public abstract fun getPluginVersion ()Ljava/lang/String; } -public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinCompilation : org/gradle/api/Named, org/gradle/api/attributes/HasAttributes, org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies { +public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinCompilation : org/gradle/api/Named, org/gradle/api/attributes/HasAttributes, org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies, org/jetbrains/kotlin/gradle/plugin/HasProject, org/jetbrains/kotlin/tooling/core/HasMutableExtras { public static final field Companion Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilation$Companion; public static final field MAIN_COMPILATION_NAME Ljava/lang/String; public static final field TEST_COMPILATION_NAME Ljava/lang/String; @@ -718,7 +722,6 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinCompila public abstract fun getName ()Ljava/lang/String; public abstract fun getOutput ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationOutput; public abstract fun getPlatformType ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinPlatformType; - public abstract fun getProject ()Lorg/gradle/api/Project; public abstract fun getRelatedConfigurationNames ()Ljava/util/List; public abstract fun getRuntimeDependencyConfigurationName ()Ljava/lang/String; public abstract fun getRuntimeDependencyFiles ()Lorg/gradle/api/file/FileCollection; @@ -970,7 +973,7 @@ public final class org/jetbrains/kotlin/gradle/plugin/KotlinPlatformType$Disambi public fun execute (Lorg/gradle/api/attributes/MultipleCandidatesDetails;)V } -public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet : org/gradle/api/Named, org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies { +public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet : org/gradle/api/Named, org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies, org/jetbrains/kotlin/gradle/plugin/HasProject, org/jetbrains/kotlin/tooling/core/HasMutableExtras { public static final field COMMON_MAIN_SOURCE_SET_NAME Ljava/lang/String; public static final field COMMON_TEST_SOURCE_SET_NAME Ljava/lang/String; public static final field Companion Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSet$Companion; @@ -1007,7 +1010,7 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinSourceS public abstract fun getSourceSets ()Lorg/gradle/api/NamedDomainObjectContainer; } -public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinTarget : org/gradle/api/Named, org/gradle/api/attributes/HasAttributes { +public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinTarget : org/gradle/api/Named, org/gradle/api/attributes/HasAttributes, org/jetbrains/kotlin/gradle/plugin/HasProject, org/jetbrains/kotlin/tooling/core/HasMutableExtras { public abstract fun attributes (Lkotlin/jvm/functions/Function1;)V public abstract fun attributes (Lorg/gradle/api/Action;)V public abstract fun getApiElementsConfigurationName ()Ljava/lang/String; @@ -1020,7 +1023,6 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinTarget public abstract fun getOverrideDisambiguationClassifierOnIdeImport ()Ljava/lang/String; public abstract fun getPlatformType ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinPlatformType; public abstract fun getPreset ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinTargetPreset; - public abstract fun getProject ()Lorg/gradle/api/Project; public abstract fun getPublishable ()Z public abstract fun getRuntimeElementsConfigurationName ()Ljava/lang/String; public abstract fun getSourcesElementsConfigurationName ()Ljava/lang/String; diff --git a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts index 525f745875d..f1657cfbe47 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { commonApi(project(":kotlin-gradle-plugin-annotations")) commonApi(project(":native:kotlin-native-utils")) commonApi(project(":kotlin-project-model")) - commonImplementation(project(":kotlin-tooling-core")) + commonApi(project(":kotlin-tooling-core")) commonCompileOnly(project(":kotlin-gradle-compiler-types")) commonCompileOnly("com.android.tools.build:gradle-api:4.2.2") { diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasProject.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasProject.kt new file mode 100644 index 00000000000..3bd6fdc9eef --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasProject.kt @@ -0,0 +1,12 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.plugin + +import org.gradle.api.Project + +interface HasProject { + val project: Project +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt index c148c0c40ec..dfb094d5ece 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt @@ -17,13 +17,14 @@ import org.gradle.api.tasks.TaskProvider import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptionsDeprecated import org.jetbrains.kotlin.gradle.dsl.KotlinCompileDeprecated import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask +import org.jetbrains.kotlin.tooling.core.HasMutableExtras interface KotlinCompilation : Named, + HasProject, + HasMutableExtras, HasAttributes, HasKotlinDependencies { - val project: Project - val target: KotlinTarget val compilationName: String diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt index 80a193e7f45..4e00a7edb65 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt @@ -8,8 +8,9 @@ package org.jetbrains.kotlin.gradle.plugin import org.gradle.api.Action import org.gradle.api.Named import org.gradle.api.file.SourceDirectorySet +import org.jetbrains.kotlin.tooling.core.HasMutableExtras -interface KotlinSourceSet : Named, HasKotlinDependencies { +interface KotlinSourceSet : Named, HasProject, HasMutableExtras, HasKotlinDependencies { val kotlin: SourceDirectorySet fun kotlin(configure: SourceDirectorySet.() -> Unit): SourceDirectorySet @@ -27,10 +28,13 @@ interface KotlinSourceSet : Named, HasKotlinDependencies { @Deprecated(message = "KT-55312") val apiMetadataConfigurationName: String + @Deprecated(message = "KT-55312") val implementationMetadataConfigurationName: String + @Deprecated(message = "KT-55312") val compileOnlyMetadataConfigurationName: String + @Deprecated(message = "KT-55230: RuntimeOnly scope is not supported for metadata dependency transformation") val runtimeOnlyMetadataConfigurationName: String diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt index 520939e1839..17a0561e728 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt @@ -16,8 +16,9 @@ import org.gradle.api.attributes.HasAttributes import org.gradle.api.component.SoftwareComponent import org.gradle.api.publish.maven.MavenPublication import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptionsDeprecated +import org.jetbrains.kotlin.tooling.core.HasMutableExtras -interface KotlinTarget : Named, HasAttributes { +interface KotlinTarget : Named, HasAttributes, HasProject, HasMutableExtras { val targetName: String val disambiguationClassifier: String? get() = targetName val useDisambiguationClassifierAsSourceSetNamePrefix: Boolean @@ -27,8 +28,6 @@ interface KotlinTarget : Named, HasAttributes { val compilations: NamedDomainObjectContainer> - val project: Project - val artifactsTaskName: String val defaultConfigurationName: String diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyLogger.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyLogger.kt index 33b7cca397a..3216b6a0a19 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyLogger.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyLogger.kt @@ -9,7 +9,6 @@ import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.extraProperties import org.jetbrains.kotlin.gradle.plugin.getOrNull -import org.jetbrains.kotlin.gradle.plugin.sources.project internal object IdeDependencyLogger : IdeDependencyEffect { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt index a2a866a1d97..db8bc9b5193 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.gradle.plugin.ide.IdeMultiplatformImport.DependencyR import org.jetbrains.kotlin.gradle.plugin.ide.IdeMultiplatformImport.SourceSetConstraint import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeCompilation import org.jetbrains.kotlin.gradle.plugin.sources.internal -import org.jetbrains.kotlin.gradle.plugin.sources.project import org.jetbrains.kotlin.gradle.targets.metadata.isNativeSourceSet import org.jetbrains.kotlin.gradle.targets.metadata.isSingleKotlinTargetSourceSet import org.jetbrains.kotlin.gradle.targets.metadata.isSinglePlatformTypeSourceSet diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeArtifactResolutionQuerySourcesAndDocumentationResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeArtifactResolutionQuerySourcesAndDocumentationResolver.kt index b0bbcb87e0f..249120cef2c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeArtifactResolutionQuerySourcesAndDocumentationResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeArtifactResolutionQuerySourcesAndDocumentationResolver.kt @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.gradle.plugin.ide.IdeaKotlinBinaryCoordinates import org.jetbrains.kotlin.gradle.plugin.mpp.internal import org.jetbrains.kotlin.gradle.plugin.mpp.resolvableMetadataConfiguration import org.jetbrains.kotlin.gradle.plugin.sources.internal -import org.jetbrains.kotlin.gradle.plugin.sources.project /** * Resolved sources.jar and javadoc.jar files using Gradle's artifact resolution query. diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeBinaryDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeBinaryDependencyResolver.kt index c326532f0cb..fc0f3fa8830 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeBinaryDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeBinaryDependencyResolver.kt @@ -32,7 +32,6 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.resolvableMetadataConfiguration import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.sources.InternalKotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.sources.internal -import org.jetbrains.kotlin.gradle.plugin.sources.project import org.jetbrains.kotlin.gradle.utils.markResolvable import org.jetbrains.kotlin.tooling.core.mutableExtrasOf diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeDependsOnDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeDependsOnDependencyResolver.kt index 1ab65f1b224..ca4ec1e92a4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeDependsOnDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeDependsOnDependencyResolver.kt @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.ide.IdeDependencyResolver import org.jetbrains.kotlin.gradle.plugin.ide.IdeaKotlinProjectCoordinates import org.jetbrains.kotlin.gradle.plugin.sources.internal -import org.jetbrains.kotlin.gradle.plugin.sources.project internal object IdeDependsOnDependencyResolver : IdeDependencyResolver { override fun resolve(sourceSet: KotlinSourceSet): Set { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeJvmAndAndroidSourceDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeJvmAndAndroidSourceDependencyResolver.kt index 0ba31ed54c6..33489026600 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeJvmAndAndroidSourceDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeJvmAndAndroidSourceDependencyResolver.kt @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.sources.android.AndroidVariantType import org.jetbrains.kotlin.gradle.plugin.sources.android.type import org.jetbrains.kotlin.gradle.plugin.sources.internal -import org.jetbrains.kotlin.gradle.plugin.sources.project internal object IdeJvmAndAndroidSourceDependencyResolver : IdeDependencyResolver { override fun resolve(sourceSet: KotlinSourceSet): Set { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeMetadataSourcesResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeMetadataSourcesResolver.kt index a635108f744..898f96740a8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeMetadataSourcesResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeMetadataSourcesResolver.kt @@ -14,7 +14,6 @@ import org.jetbrains.kotlin.gradle.plugin.ide.IdeDependencyResolver import org.jetbrains.kotlin.gradle.plugin.ide.asAdditionalArtifactResolver import org.jetbrains.kotlin.gradle.plugin.mpp.resolvableMetadataConfiguration import org.jetbrains.kotlin.gradle.plugin.sources.internal -import org.jetbrains.kotlin.gradle.plugin.sources.project import org.jetbrains.kotlin.gradle.utils.named internal fun IdeMetadataSourcesResolver(): IdeAdditionalArtifactResolver = IdeBinaryDependencyResolver( 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 412cbdaec64..8c0aa9d906c 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 @@ -21,7 +21,6 @@ import org.jetbrains.kotlin.gradle.idea.tcs.extras.sourcesClasspath import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.ide.IdeDependencyResolver import org.jetbrains.kotlin.gradle.plugin.ide.KlibExtra -import org.jetbrains.kotlin.gradle.plugin.sources.project import org.jetbrains.kotlin.konan.file.File import org.jetbrains.kotlin.library.ToolingSingleFileKlibResolveStrategy import org.jetbrains.kotlin.library.resolveSingleFileKlib diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdePlatformSourcesResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdePlatformSourcesResolver.kt index 01f3de0287b..fa4d5f10e16 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdePlatformSourcesResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdePlatformSourcesResolver.kt @@ -10,7 +10,6 @@ package org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers import org.gradle.api.attributes.Category import org.gradle.api.attributes.DocsType import org.jetbrains.kotlin.gradle.plugin.ide.IdeDependencyResolver -import org.jetbrains.kotlin.gradle.plugin.sources.project import org.jetbrains.kotlin.gradle.utils.named internal fun IdePlatformSourcesResolver(): IdeBinaryDependencyResolver = IdeBinaryDependencyResolver( diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/factories.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/factories.kt index 9882beaa57a..a8ae3daf310 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/factories.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/factories.kt @@ -14,7 +14,6 @@ import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceCoordinates import org.jetbrains.kotlin.gradle.idea.tcs.extras.KlibExtra import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.currentBuildId -import org.jetbrains.kotlin.gradle.plugin.sources.project import org.jetbrains.kotlin.library.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinCompilation.kt index adc994c89bd..55cdbebe59c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinCompilation.kt @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationConfigurationsContainer import org.jetbrains.kotlin.gradle.utils.ObservableSet import org.jetbrains.kotlin.tooling.core.HasMutableExtras -import org.jetbrains.kotlin.tooling.core.MutableExtras internal interface InternalKotlinCompilation : KotlinCompilation, HasMutableExtras { override val kotlinSourceSets: ObservableSet diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/InternalKotlinSourceSet.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/InternalKotlinSourceSet.kt index d6d4823abad..8537d052de8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/InternalKotlinSourceSet.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/InternalKotlinSourceSet.kt @@ -5,24 +5,19 @@ package org.jetbrains.kotlin.gradle.plugin.sources -import org.gradle.api.Project import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.utils.MutableObservableSet import org.jetbrains.kotlin.gradle.utils.ObservableSet -import org.jetbrains.kotlin.tooling.core.HasMutableExtras internal val KotlinSourceSet.internal: InternalKotlinSourceSet get() = (this as? InternalKotlinSourceSet) ?: throw IllegalArgumentException( "KotlinSourceSet $name (${this::class}) does not implement ${InternalKotlinSourceSet::class.simpleName}" ) -internal interface InternalKotlinSourceSet : KotlinSourceSet, HasMutableExtras { - val project: Project +internal interface InternalKotlinSourceSet : KotlinSourceSet { override val dependsOn: ObservableSet val dependsOnClosure: ObservableSet val withDependsOnClosure: ObservableSet val compilations: MutableObservableSet> } - -internal val KotlinSourceSet.project: Project get() = this.internal.project