From 0b5d905577c5722d4d7122cfd5ceb01794d1f024 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Mon, 28 Nov 2022 17:30:54 +0100 Subject: [PATCH] [Gradle] Update kotlin-tooling-core.api and kotlin-gradle-plugin-idea.api ^KT-55112 Verification Pending --- .../api/kotlin-gradle-plugin-idea.api | 23 +++++-------------- .../api/kotlin-tooling-core.api | 13 +++++++++++ 2 files changed, 19 insertions(+), 17 deletions(-) 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 8f5dca31072..04c04d97a8b 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 @@ -297,13 +297,12 @@ public abstract class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDepen public abstract fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates; } -public abstract interface class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency : java/io/Serializable { +public abstract interface class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency : java/io/Serializable, org/jetbrains/kotlin/tooling/core/HasMutableExtras { public static final field CLASSPATH_BINARY_TYPE Ljava/lang/String; public static final field Companion Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency$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/tcs/IdeaKotlinDependencyCoordinates; - public abstract fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/MutableExtras; } public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency$Companion { @@ -347,27 +346,14 @@ public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifac public fun equals (Ljava/lang/Object;)Z public synthetic fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates; public fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactCoordinates; + public synthetic fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/Extras; public fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/MutableExtras; public final fun getType ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency$Type; public fun hashCode ()I + public final fun resolved (Ljava/lang/Iterable;)Ljava/util/Set; public fun toString ()Ljava/lang/String; } -public abstract interface class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency$Resolver { - public static final field Companion Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency$Resolver$Companion; - public abstract fun resolve (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency; -} - -public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency$Resolver$Companion { - public final fun byName (Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency$Resolver; - public final fun composite (Ljava/lang/Iterable;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency$Resolver; - public final fun composite ([Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency$Resolver;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency$Resolver; -} - -public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependencyKt { - public static final fun resolved (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency$Resolver;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency; -} - public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates : java/io/Serializable { public static final field serialVersionUID J public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V @@ -399,6 +385,7 @@ public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinResolvedBinary public final fun getBinaryType ()Ljava/lang/String; public fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates; public synthetic fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates; + public synthetic fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/Extras; public fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/MutableExtras; public fun hashCode ()I public fun toString ()Ljava/lang/String; @@ -436,6 +423,7 @@ public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependen public fun equals (Ljava/lang/Object;)Z public synthetic fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates; public fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceCoordinates; + public synthetic fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/Extras; public fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/MutableExtras; public final fun getType ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency$Type; public fun hashCode ()I @@ -464,6 +452,7 @@ public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinUnresolvedBina public final fun getCause ()Ljava/lang/String; public fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates; public synthetic fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates; + public synthetic fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/Extras; public fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/MutableExtras; public fun hashCode ()I public fun toString ()Ljava/lang/String; diff --git a/libraries/tools/kotlin-tooling-core/api/kotlin-tooling-core.api b/libraries/tools/kotlin-tooling-core/api/kotlin-tooling-core.api index d4775442022..598b88fb356 100644 --- a/libraries/tools/kotlin-tooling-core/api/kotlin-tooling-core.api +++ b/libraries/tools/kotlin-tooling-core/api/kotlin-tooling-core.api @@ -89,6 +89,19 @@ public final class org/jetbrains/kotlin/tooling/core/ExtrasUtilsKt { public static final fun withValue (Lorg/jetbrains/kotlin/tooling/core/Extras$Key;Ljava/lang/Object;)Lorg/jetbrains/kotlin/tooling/core/Extras$Entry; } +public abstract interface class org/jetbrains/kotlin/tooling/core/HasExtras { + public abstract fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/Extras; +} + +public final class org/jetbrains/kotlin/tooling/core/HasExtrasKt { + public static final fun getValue (Lorg/jetbrains/kotlin/tooling/core/Extras$Key;Lorg/jetbrains/kotlin/tooling/core/HasExtras;Lkotlin/reflect/KProperty;)Ljava/lang/Object; + public static final fun setValue (Lorg/jetbrains/kotlin/tooling/core/Extras$Key;Lorg/jetbrains/kotlin/tooling/core/HasMutableExtras;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V +} + +public abstract interface class org/jetbrains/kotlin/tooling/core/HasMutableExtras : org/jetbrains/kotlin/tooling/core/HasExtras { + public abstract fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/MutableExtras; +} + public final class org/jetbrains/kotlin/tooling/core/KotlinToolingVersion : java/io/Serializable, java/lang/Comparable { public fun (IIILjava/lang/String;)V public synthetic fun compareTo (Ljava/lang/Object;)I