From 34abc008ec6f3796e860db5dcb7a4cb5ddb4ef57 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Fri, 25 Aug 2023 14:49:19 +0200 Subject: [PATCH] [Gradle] Update api dump after removing KPM import code KT-61463 --- .../api/kotlin-gradle-plugin-idea-proto.api | 8 - .../api/kotlin-gradle-plugin-idea.api | 216 ------------------ .../api/kotlin-gradle-plugin.api | 4 + 3 files changed, 4 insertions(+), 224 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/api/kotlin-gradle-plugin-idea-proto.api b/libraries/tools/kotlin-gradle-plugin-idea-proto/api/kotlin-gradle-plugin-idea-proto.api index f22477ee70a..ac938ffa6b6 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/api/kotlin-gradle-plugin-idea-proto.api +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/api/kotlin-gradle-plugin-idea-proto.api @@ -3,14 +3,6 @@ public final class org/jetbrains/kotlin/gradle/idea/proto/ExtrasKt { public static final fun toByteArray (Lorg/jetbrains/kotlin/tooling/core/Extras;Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;)[B } -public final class org/jetbrains/kotlin/gradle/idea/proto/kpm/KpmIdeaProto { - public static final fun IdeaKpmProject (Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;Ljava/io/InputStream;)Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject; - public static final fun IdeaKpmProject (Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;Ljava/nio/ByteBuffer;)Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject; - public static final fun IdeaKpmProject (Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;[B)Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject; - public static final fun toByteArray (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject;Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;)[B - public static final fun writeTo (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject;Ljava/io/OutputStream;Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;)V -} - public final class org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinClasspathKt { public static final fun IdeaKotlinClasspath ([B)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath; public static final fun toByteArray (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;)[B diff --git a/libraries/tools/kotlin-gradle-plugin-idea/api/kotlin-gradle-plugin-idea.api b/libraries/tools/kotlin-gradle-plugin-idea/api/kotlin-gradle-plugin-idea.api index e554cdd09c3..c2d0d712453 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/api/kotlin-gradle-plugin-idea.api +++ b/libraries/tools/kotlin-gradle-plugin-idea/api/kotlin-gradle-plugin-idea.api @@ -1,219 +1,3 @@ -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmBinaryCoordinates : org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependencyCoordinates { - public abstract fun getGroup ()Ljava/lang/String; - public abstract fun getKotlinFragmentName ()Ljava/lang/String; - public abstract fun getKotlinModuleName ()Ljava/lang/String; - public abstract fun getModule ()Ljava/lang/String; - public abstract fun getVersion ()Ljava/lang/String; -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmBinaryCoordinatesImpl$Companion { -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmBinaryDependency : org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependency { - public abstract fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmBinaryCoordinates; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmCompilationOutput : java/io/Serializable { - public abstract fun getClassesDirs ()Ljava/util/Set; - public abstract fun getResourcesDir ()Ljava/io/File; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmContentRoot : java/io/Serializable { - public static final field Companion Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmContentRoot$Companion; - public static final field RESOURCES_TYPE Ljava/lang/String; - public static final field SOURCES_TYPE Ljava/lang/String; - public abstract fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/Extras; - public abstract fun getFile ()Ljava/io/File; - public abstract fun getType ()Ljava/lang/String; -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmContentRoot$Companion { - public static final field RESOURCES_TYPE Ljava/lang/String; - public static final field SOURCES_TYPE Ljava/lang/String; -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmContentRootKt { - public static final fun isResources (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmContentRoot;)Z - public static final fun isSources (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmContentRoot;)Z -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependency : java/io/Serializable { - public static final field CLASSPATH_BINARY_TYPE Ljava/lang/String; - public static final field Companion Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependency$Companion; - public static final field DOCUMENTATION_BINARY_TYPE Ljava/lang/String; - public static final field SOURCES_BINARY_TYPE Ljava/lang/String; - public abstract fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependencyCoordinates; - public abstract fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/Extras; -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependency$Companion { - public static final field CLASSPATH_BINARY_TYPE Ljava/lang/String; - public static final field DOCUMENTATION_BINARY_TYPE Ljava/lang/String; - public static final field SOURCES_BINARY_TYPE Ljava/lang/String; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependencyCoordinates : java/io/Serializable { -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependencyKt { - public static final fun isClasspathType (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmResolvedBinaryDependency;)Z - public static final fun isDocumentationType (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmResolvedBinaryDependency;)Z - public static final fun isSourcesType (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmResolvedBinaryDependency;)Z -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragment : java/io/Serializable { - public abstract fun getContentRoots ()Ljava/util/List; - public abstract fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentCoordinates; - public abstract fun getDependencies ()Ljava/util/List; - public abstract fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/Extras; - public abstract fun getLanguageSettings ()Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmLanguageSettings; - public abstract fun getPlatforms ()Ljava/util/Set; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentCoordinates : java/io/Serializable, org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependencyCoordinates { - public abstract fun getFragmentName ()Ljava/lang/String; - public abstract fun getModule ()Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModuleCoordinates; -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentCoordinatesKt { - public static final fun getPath (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentCoordinates;)Ljava/lang/String; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentDependency : org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependency { - public abstract fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentCoordinates; - public abstract fun getType ()Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentDependency$Type; -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentDependency$Type : java/lang/Enum, java/io/Serializable { - public static final field Companion Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentDependency$Type$Companion; - public static final field Friend Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentDependency$Type; - public static final field Refines Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentDependency$Type; - public static final field Regular Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentDependency$Type; - public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentDependency$Type; - public static fun values ()[Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentDependency$Type; -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentKt { - public static final fun getName (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragment;)Ljava/lang/String; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmJsPlatform : org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform { - public abstract fun isIr ()Z -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmJvmPlatform : org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform { - public abstract fun getJvmTarget ()Ljava/lang/String; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmLanguageSettings : java/io/Serializable { - public abstract fun getApiVersion ()Ljava/lang/String; - public abstract fun getCompilerPluginArguments ()Ljava/util/List; - public abstract fun getCompilerPluginClasspath ()Ljava/util/List; - public abstract fun getEnabledLanguageFeatures ()Ljava/util/Set; - public abstract fun getFreeCompilerArgs ()Ljava/util/List; - public abstract fun getLanguageVersion ()Ljava/lang/String; - public abstract fun getOptInAnnotationsInUse ()Ljava/util/Set; - public abstract fun isProgressiveMode ()Z -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModule : java/io/Serializable { - public abstract fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModuleCoordinates; - public abstract fun getFragments ()Ljava/util/List; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModuleCoordinates : java/io/Serializable { - public abstract fun getBuildId ()Ljava/lang/String; - public abstract fun getModuleClassifier ()Ljava/lang/String; - public abstract fun getModuleName ()Ljava/lang/String; - public abstract fun getProjectName ()Ljava/lang/String; - public abstract fun getProjectPath ()Ljava/lang/String; -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModuleCoordinatesKt { - public static final fun getPath (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModuleCoordinates;)Ljava/lang/String; -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModuleKt { - public static final fun getModuleClassifier (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModule;)Ljava/lang/String; - public static final fun getName (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModule;)Ljava/lang/String; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmNativePlatform : org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform { - public abstract fun getKonanTarget ()Ljava/lang/String; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform : java/io/Serializable { - public abstract fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/Extras; -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatformKt { - public static final fun isJs (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform;)Z - public static final fun isJvm (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform;)Z - public static final fun isNative (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform;)Z - public static final fun isUnknown (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform;)Z - public static final fun isWasm (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform;)Z -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject : java/io/Serializable { - public abstract fun getCoreLibrariesVersion ()Ljava/lang/String; - public abstract fun getExplicitApiModeCliOption ()Ljava/lang/String; - public abstract fun getGradlePluginVersion ()Ljava/lang/String; - public abstract fun getKotlinNativeHome ()Ljava/io/File; - public abstract fun getModules ()Ljava/util/List; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectBinaryContainer : org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectContainer { - public abstract fun getBinaryOrNull ()[B - public abstract fun getInstanceOrNull ()Ljava/lang/Void; -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectBinaryContainer$DefaultImpls { - public static fun getBinaryOrNull (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectBinaryContainer;)[B - public static fun getInstanceOrNull (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectBinaryContainer;)Ljava/lang/Void; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectContainer : java/io/Serializable { - public abstract fun getBinaryOrNull ()[B - public abstract fun getInstanceOrNull ()Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject; - public abstract fun getProject ()Ljava/lang/Object; -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectContainerKt { - public static final fun IdeaKpmProjectContainer (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject;)Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectInstanceContainer; - public static final fun IdeaKpmProjectContainer ([B)Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectBinaryContainer; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectInstanceContainer : org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectContainer { - public abstract fun getBinaryOrNull ()Ljava/lang/Void; - public abstract fun getInstanceOrNull ()Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject; -} - -public final class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectInstanceContainer$DefaultImpls { - public static fun getBinaryOrNull (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectInstanceContainer;)Ljava/lang/Void; - public static fun getInstanceOrNull (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectInstanceContainer;)Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmResolvedBinaryDependency : org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmBinaryDependency { - public abstract fun getBinaryFile ()Ljava/io/File; - public abstract fun getBinaryType ()Ljava/lang/String; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmUnknownPlatform : org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform { -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmUnresolvedBinaryDependency : org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmBinaryDependency { - public abstract fun getCause ()Ljava/lang/String; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmVariant : java/io/Serializable, org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragment { - public abstract fun getCompilationOutputs ()Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmCompilationOutput; - public abstract fun getPlatform ()Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform; - public abstract fun getVariantAttributes ()Ljava/util/Map; -} - -public abstract interface class org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmWasmPlatform : org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform { -} - public final class org/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinBooleanExtrasSerializer : org/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinExtrasSerializer { public static final field INSTANCE Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinBooleanExtrasSerializer; public fun deserialize (Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;[B)Ljava/lang/Boolean; diff --git a/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api b/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api index 28b6bf7a9d2..59f1d095227 100644 --- a/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api +++ b/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api @@ -821,6 +821,10 @@ public final class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotli public static final fun ExternalKotlinCompilationDescriptor (Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor; } +public final class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetApiExtensionsKt { + public static final fun getProject (Lorg/jetbrains/kotlin/gradle/dsl/KotlinTopLevelExtension;)Lorg/gradle/api/Project; +} + public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetApiUtils { public abstract fun enableKgpBasedDependencyResolution (Z)V public abstract fun publishJvmEnvironmentAttribute (Z)V