From ccbca7a01915a7bc2b85c0348a1e064622e921ce Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Wed, 10 May 2023 23:27:14 +0200 Subject: [PATCH] [Gradle] Move pm20 interfaces from plugin/api into plugin codebase ^KT-58619 Fixed --- .../api/kotlin-gradle-plugin-api.api | 230 ------------------ .../mpp/pm20/GradleKpmCompilationData.kt | 6 +- .../mpp/pm20/GradleKpmCompilerPlugin.kt | 0 .../pm20/GradleKpmDependencyConfigurations.kt | 0 .../plugin/mpp/pm20/GradleKpmFragment.kt | 0 ...adleKpmFragmentDependencyConfigurations.kt | 0 .../gradle/plugin/mpp/pm20/GradleKpmModule.kt | 0 ...adleKpmSingleMavenPublishedModuleHolder.kt | 0 .../plugin/mpp/pm20/GradleKpmVariant.kt | 0 .../pm20/GradleKpmVariantCompilationData.kt | 6 +- 10 files changed, 4 insertions(+), 238 deletions(-) rename libraries/tools/{kotlin-gradle-plugin-api => kotlin-gradle-plugin}/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilationData.kt (88%) rename libraries/tools/{kotlin-gradle-plugin-api => kotlin-gradle-plugin}/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilerPlugin.kt (100%) rename libraries/tools/{kotlin-gradle-plugin-api => kotlin-gradle-plugin}/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmDependencyConfigurations.kt (100%) rename libraries/tools/{kotlin-gradle-plugin-api => kotlin-gradle-plugin}/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment.kt (100%) rename libraries/tools/{kotlin-gradle-plugin-api => kotlin-gradle-plugin}/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragmentDependencyConfigurations.kt (100%) rename libraries/tools/{kotlin-gradle-plugin-api => kotlin-gradle-plugin}/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule.kt (100%) rename libraries/tools/{kotlin-gradle-plugin-api => kotlin-gradle-plugin}/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmSingleMavenPublishedModuleHolder.kt (100%) rename libraries/tools/{kotlin-gradle-plugin-api => kotlin-gradle-plugin}/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant.kt (100%) rename libraries/tools/{kotlin-gradle-plugin-api => kotlin-gradle-plugin}/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData.kt (89%) 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 762bee9211c..28e19b109ab 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 @@ -1278,236 +1278,6 @@ public class org/jetbrains/kotlin/gradle/plugin/mpp/NativeOutputKind : java/lang public static fun values ()[Lorg/jetbrains/kotlin/gradle/plugin/mpp/NativeOutputKind; } -public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilationData { - public abstract fun getCompilationClassifier ()Ljava/lang/String; - public abstract fun getCompilationPurpose ()Ljava/lang/String; - public abstract fun getCompileAllTaskName ()Ljava/lang/String; - public abstract fun getCompileDependencyFiles ()Lorg/gradle/api/file/FileCollection; - public abstract fun getCompileKotlinTaskName ()Ljava/lang/String; - public abstract fun getCompilerOptions ()Lorg/jetbrains/kotlin/gradle/plugin/HasCompilerOptions; - public abstract fun getFriendPaths ()Ljava/lang/Iterable; - public abstract fun getKotlinOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions; - public abstract fun getKotlinSourceDirectoriesByFragmentName ()Ljava/util/Map; - public abstract fun getLanguageSettings ()Lorg/jetbrains/kotlin/project/model/LanguageSettings; - public abstract fun getModuleName ()Ljava/lang/String; - public abstract fun getOutput ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationOutput; - public abstract fun getOwner ()Ljava/lang/Object; - public abstract fun getPlatformType ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinPlatformType; - public abstract fun getProject ()Lorg/gradle/api/Project; -} - -public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilerPlugin : org/gradle/api/Plugin { - public abstract fun getKpmCompilerPlugin ()Lorg/jetbrains/kotlin/project/model/KpmCompilerPlugin; -} - -public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmDependencyConfigurations { - public abstract fun getApiConfiguration ()Lorg/gradle/api/artifacts/Configuration; - public abstract fun getCompileOnlyConfiguration ()Lorg/gradle/api/artifacts/Configuration; - public abstract fun getImplementationConfiguration ()Lorg/gradle/api/artifacts/Configuration; - public abstract fun getRuntimeOnlyConfiguration ()Lorg/gradle/api/artifacts/Configuration; -} - -public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment : org/gradle/api/Named, org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies, org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragmentDependencyConfigurations, org/jetbrains/kotlin/project/model/KpmFragment { - public static final field COMMON_FRAGMENT_NAME Ljava/lang/String; - public static final field Companion Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment$Companion; - public abstract fun dependencies (Lorg/gradle/api/Action;)V - public abstract fun getApiConfigurationName ()Ljava/lang/String; - public abstract fun getCompileOnlyConfigurationName ()Ljava/lang/String; - public abstract fun getContainingModule ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule; - public abstract fun getDeclaredRefinesDependencies ()Ljava/lang/Iterable; - public abstract fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/MutableExtras; - public abstract fun getImplementationConfigurationName ()Ljava/lang/String; - public abstract fun getKotlinSourceRoots ()Lorg/gradle/api/file/SourceDirectorySet; - public abstract fun getLanguageSettings ()Lorg/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder; - public abstract fun getName ()Ljava/lang/String; - public abstract fun getProject ()Lorg/gradle/api/Project; - public abstract fun getRefinesClosure ()Ljava/util/Set; - public abstract fun getRelatedConfigurationNames ()Ljava/util/List; - public abstract fun getRuntimeOnlyConfigurationName ()Ljava/lang/String; - public abstract fun getWithRefinesClosure ()Ljava/util/Set; - public abstract fun refines (Lorg/gradle/api/NamedDomainObjectProvider;)V - public abstract fun refines (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment;)V -} - -public final class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment$Companion { - public static final field COMMON_FRAGMENT_NAME Ljava/lang/String; -} - -public final class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment$DefaultImpls { - public static fun dependencies (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment;Lorg/gradle/api/Action;)V - public static fun getApiConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment;)Ljava/lang/String; - public static fun getCompileOnlyConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment;)Ljava/lang/String; - public static fun getImplementationConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment;)Ljava/lang/String; - public static fun getName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment;)Ljava/lang/String; - public static fun getProject (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment;)Lorg/gradle/api/Project; - public static fun getRefinesClosure (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment;)Ljava/util/Set; - public static fun getRelatedConfigurationNames (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment;)Ljava/util/List; - public static fun getRuntimeOnlyConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment;)Ljava/lang/String; - public static fun getWithRefinesClosure (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment;)Ljava/util/Set; -} - -public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragmentDependencyConfigurations : org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmDependencyConfigurations { - public static final field Companion Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragmentDependencyConfigurations$Companion; - public abstract fun getTransitiveApiConfiguration ()Lorg/gradle/api/artifacts/Configuration; - public abstract fun getTransitiveImplementationConfiguration ()Lorg/gradle/api/artifacts/Configuration; - public abstract fun getTransitiveRuntimeOnlyConfiguration ()Lorg/gradle/api/artifacts/Configuration; -} - -public final class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragmentDependencyConfigurations$Companion { - public final fun create (Lorg/gradle/api/artifacts/Configuration;Lorg/gradle/api/artifacts/Configuration;Lorg/gradle/api/artifacts/Configuration;Lorg/gradle/api/artifacts/Configuration;Lorg/gradle/api/artifacts/Configuration;Lorg/gradle/api/artifacts/Configuration;Lorg/gradle/api/artifacts/Configuration;)Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragmentDependencyConfigurations; -} - -public final class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragmentKt { - public static final fun getContainingVariants (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment;)Ljava/util/Set; - public static final fun getPath (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment;)Ljava/lang/String; -} - -public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule : org/gradle/api/Named, org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies, org/jetbrains/kotlin/project/model/KpmModule { - public static final field Companion Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule$Companion; - public static final field MAIN_MODULE_NAME Ljava/lang/String; - public static final field TEST_MODULE_NAME Ljava/lang/String; - public abstract fun common (Lkotlin/jvm/functions/Function1;)V - public abstract fun dependencies (Lkotlin/jvm/functions/Function1;)V - public abstract fun dependencies (Lorg/gradle/api/Action;)V - public abstract fun getApiConfigurationName ()Ljava/lang/String; - public abstract fun getCommon ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment; - public abstract fun getCompileOnlyConfigurationName ()Ljava/lang/String; - public abstract fun getFragments ()Lorg/gradle/api/ExtensiblePolymorphicDomainObjectContainer; - public abstract fun getImplementationConfigurationName ()Ljava/lang/String; - public abstract fun getModuleClassifier ()Ljava/lang/String; - public abstract fun getName ()Ljava/lang/String; - public abstract fun getPlugins ()Ljava/util/Set; - public abstract fun getProject ()Lorg/gradle/api/Project; - public abstract fun getRuntimeOnlyConfigurationName ()Ljava/lang/String; - public abstract fun getVariants ()Lorg/gradle/api/NamedDomainObjectSet; - public abstract fun ifMadePublic (Lkotlin/jvm/functions/Function0;)V - public abstract fun isPublic ()Z - public abstract fun makePublic ()V -} - -public final class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule$Companion { - public static final field MAIN_MODULE_NAME Ljava/lang/String; - public static final field TEST_MODULE_NAME Ljava/lang/String; - public final fun getModuleName (Lorg/jetbrains/kotlin/project/model/KpmModuleIdentifier;)Ljava/lang/String; -} - -public final class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule$DefaultImpls { - public static fun common (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule;Lkotlin/jvm/functions/Function1;)V - public static fun dependencies (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule;Lkotlin/jvm/functions/Function1;)V - public static fun dependencies (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule;Lorg/gradle/api/Action;)V - public static fun getApiConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule;)Ljava/lang/String; - public static fun getCommon (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule;)Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment; - public static fun getCompileOnlyConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule;)Ljava/lang/String; - public static fun getImplementationConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule;)Ljava/lang/String; - public static fun getName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule;)Ljava/lang/String; - public static fun getRelatedConfigurationNames (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule;)Ljava/util/List; - public static fun getRuntimeOnlyConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule;)Ljava/lang/String; -} - -public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariant : org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant { - public abstract fun getEnableEndorsedLibraries ()Z - public abstract fun getHostSpecificMetadataElementsConfiguration ()Lorg/gradle/api/artifacts/Configuration; - public abstract fun getPlatformType ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinPlatformType; - public abstract fun setEnableEndorsedLibraries (Z)V -} - -public final class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariant$DefaultImpls { - public static fun dependencies (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariant;Lorg/gradle/api/Action;)V - public static fun getApiConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariant;)Ljava/lang/String; - public static fun getCompileOnlyConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariant;)Ljava/lang/String; - public static fun getImplementationConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariant;)Ljava/lang/String; - public static fun getName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariant;)Ljava/lang/String; - public static fun getPlatformType (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariant;)Lorg/jetbrains/kotlin/gradle/plugin/KotlinPlatformType; - public static fun getProject (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariant;)Lorg/gradle/api/Project; - public static fun getRefinesClosure (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariant;)Ljava/util/Set; - public static fun getRelatedConfigurationNames (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariant;)Ljava/util/List; - public static fun getRuntimeOnlyConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariant;)Ljava/lang/String; - public static fun getWithRefinesClosure (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariant;)Ljava/util/Set; -} - -public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmSingleMavenPublishedModuleHolder { - public abstract fun assignMavenPublication (Lorg/gradle/api/publish/maven/MavenPublication;)V - public abstract fun getDefaultPublishedModuleSuffix ()Ljava/lang/String; - public abstract fun getPublishedMavenModuleCoordinates ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/PublishedModuleCoordinatesProvider; - public abstract fun whenPublicationAssigned (Lkotlin/jvm/functions/Function1;)V -} - -public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant : org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment, org/jetbrains/kotlin/project/model/KpmVariant { - public abstract fun getApiElementsConfiguration ()Lorg/gradle/api/artifacts/Configuration; - public abstract fun getCompilationOutputs ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationOutput; - public abstract fun getCompileDependenciesConfiguration ()Lorg/gradle/api/artifacts/Configuration; - public abstract fun getCompileDependencyFiles ()Lorg/gradle/api/file/FileCollection; - public abstract fun getGradleVariantNames ()Ljava/util/Set; - public abstract fun getPlatformType ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinPlatformType; - public abstract fun getSourceArchiveTaskName ()Ljava/lang/String; - public abstract fun setCompileDependencyFiles (Lorg/gradle/api/file/FileCollection;)V -} - -public final class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant$DefaultImpls { - public static fun dependencies (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant;Lorg/gradle/api/Action;)V - public static fun getApiConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant;)Ljava/lang/String; - public static fun getCompileOnlyConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant;)Ljava/lang/String; - public static fun getImplementationConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant;)Ljava/lang/String; - public static fun getName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant;)Ljava/lang/String; - public static fun getProject (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant;)Lorg/gradle/api/Project; - public static fun getRefinesClosure (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant;)Ljava/util/Set; - public static fun getRelatedConfigurationNames (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant;)Ljava/util/List; - public static fun getRuntimeOnlyConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant;)Ljava/lang/String; - public static fun getWithRefinesClosure (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant;)Ljava/util/Set; -} - -public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData : org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilationData { - public abstract fun getCompilationClassifier ()Ljava/lang/String; - public abstract fun getCompilationPurpose ()Ljava/lang/String; - public abstract fun getCompileAllTaskName ()Ljava/lang/String; - public abstract fun getCompileDependencyFiles ()Lorg/gradle/api/file/FileCollection; - public abstract fun getCompileKotlinTaskName ()Ljava/lang/String; - public abstract fun getKotlinSourceDirectoriesByFragmentName ()Ljava/util/Map; - public abstract fun getLanguageSettings ()Lorg/jetbrains/kotlin/project/model/LanguageSettings; - public abstract fun getOutput ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationOutput; - public abstract fun getOwner ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant; - public abstract fun getPlatformType ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinPlatformType; - public abstract fun getProject ()Lorg/gradle/api/Project; -} - -public final class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData$DefaultImpls { - public static fun getCompilationClassifier (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData;)Ljava/lang/String; - public static fun getCompilationPurpose (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData;)Ljava/lang/String; - public static fun getCompileDependencyFiles (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData;)Lorg/gradle/api/file/FileCollection; - public static fun getLanguageSettings (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData;)Lorg/jetbrains/kotlin/project/model/LanguageSettings; - public static fun getOutput (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData;)Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationOutput; - public static fun getPlatformType (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData;)Lorg/jetbrains/kotlin/gradle/plugin/KotlinPlatformType; - public static fun getProject (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData;)Lorg/gradle/api/Project; -} - -public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantWithRuntime : org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant { - public abstract fun getRuntimeDependenciesConfiguration ()Lorg/gradle/api/artifacts/Configuration; - public abstract fun getRuntimeDependencyFiles ()Lorg/gradle/api/file/FileCollection; - public abstract fun getRuntimeElementsConfiguration ()Lorg/gradle/api/artifacts/Configuration; - public abstract fun getRuntimeFiles ()Lorg/gradle/api/file/ConfigurableFileCollection; - public abstract fun setRuntimeDependencyFiles (Lorg/gradle/api/file/FileCollection;)V -} - -public final class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantWithRuntime$DefaultImpls { - public static fun dependencies (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantWithRuntime;Lorg/gradle/api/Action;)V - public static fun getApiConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantWithRuntime;)Ljava/lang/String; - public static fun getCompileOnlyConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantWithRuntime;)Ljava/lang/String; - public static fun getImplementationConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantWithRuntime;)Ljava/lang/String; - public static fun getName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantWithRuntime;)Ljava/lang/String; - public static fun getProject (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantWithRuntime;)Lorg/gradle/api/Project; - public static fun getRefinesClosure (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantWithRuntime;)Ljava/util/Set; - public static fun getRelatedConfigurationNames (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantWithRuntime;)Ljava/util/List; - public static fun getRuntimeOnlyConfigurationName (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantWithRuntime;)Ljava/lang/String; - public static fun getWithRefinesClosure (Lorg/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantWithRuntime;)Ljava/util/Set; -} - -public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/pm20/PublishedModuleCoordinatesProvider { - public abstract fun getCapabilities ()Ljava/lang/Iterable; - public abstract fun getGroup ()Ljava/lang/String; - public abstract fun getName ()Ljava/lang/String; - public abstract fun getVersion ()Ljava/lang/String; -} - public abstract interface class org/jetbrains/kotlin/gradle/tasks/BaseKapt : org/gradle/api/Task { public abstract fun getAnnotationProcessorOptionProviders ()Ljava/util/List; public abstract fun getClassesDir ()Lorg/gradle/api/file/DirectoryProperty; diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilationData.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilationData.kt similarity index 88% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilationData.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilationData.kt index 3630040498c..2650dc4bee0 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilationData.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilationData.kt @@ -3,14 +3,12 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -@file:Suppress("TYPEALIAS_EXPANSION_DEPRECATION") - package org.jetbrains.kotlin.gradle.plugin.mpp.pm20 import org.gradle.api.Project import org.gradle.api.file.FileCollection import org.gradle.api.file.SourceDirectorySet -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptionsDeprecated +import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationOutput import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType @@ -20,7 +18,7 @@ import org.jetbrains.kotlin.project.model.LanguageSettings Previously used to find a common representation for KPM and TCS. Not in use anymore. Can be removed/inlined into KPM later. */ -interface GradleKpmCompilationData { +interface GradleKpmCompilationData { val project: Project val owner: Any? diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilerPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilerPlugin.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilerPlugin.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilerPlugin.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmDependencyConfigurations.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmDependencyConfigurations.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmDependencyConfigurations.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmDependencyConfigurations.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragmentDependencyConfigurations.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragmentDependencyConfigurations.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragmentDependencyConfigurations.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragmentDependencyConfigurations.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmSingleMavenPublishedModuleHolder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmSingleMavenPublishedModuleHolder.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmSingleMavenPublishedModuleHolder.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmSingleMavenPublishedModuleHolder.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariant.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData.kt similarity index 89% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData.kt index 94180b93962..7330ba8fbc9 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationData.kt @@ -3,19 +3,17 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -@file:Suppress("TYPEALIAS_EXPANSION_DEPRECATION") - package org.jetbrains.kotlin.gradle.plugin.mpp.pm20 import org.gradle.api.Project import org.gradle.api.file.FileCollection import org.gradle.api.file.SourceDirectorySet -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptionsDeprecated +import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationOutput import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.project.model.LanguageSettings -interface GradleKpmVariantCompilationData : GradleKpmCompilationData { +interface GradleKpmVariantCompilationData : GradleKpmCompilationData { override val owner: GradleKpmVariant override val project: Project get() = owner.containingModule.project