From 82ac61e30608dbfb56a32f4d9826fae84bc74c38 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 10 May 2023 11:53:35 +0200 Subject: [PATCH] [Gradle] Remove IdeDependencyResolver and IdeDependencyTransformer .plus methods KT-58601 --- .../api/kotlin-gradle-plugin.api | 2 -- .../plugin/ide/IdeDependencyResolver.kt | 21 ------------------- .../plugin/ide/IdeDependencyTransformer.kt | 21 ------------------- 3 files changed, 44 deletions(-) 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 0fe356a4302..f52299ab971 100644 --- a/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api +++ b/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api @@ -39,7 +39,6 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/ide/IdeDepend public final class org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolverKt { public static final fun IdeDependencyResolver (Ljava/lang/Iterable;)Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver; public static final fun IdeDependencyResolver ([Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver;)Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver; - public static final fun plus (Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver;Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver;)Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver; } public abstract interface class org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer { @@ -49,7 +48,6 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/ide/IdeDepend public final class org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformerKt { public static final fun IdeDependencyTransformer (Ljava/util/List;)Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer; public static final fun IdeDependencyTransformer ([Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer;)Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer; - public static final fun plus (Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer;Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer;)Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer; public static final fun withTransformer (Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver;Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer;)Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver; } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver.kt index 25a34928a28..e90d4a689da 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver.kt @@ -125,27 +125,6 @@ fun IdeDependencyResolver( vararg resolvers: IdeDependencyResolver?, ): IdeDependencyResolver = IdeDependencyResolver(resolvers.toList()) - -/** - * Builds a composite [IdeDependencyResolver] by combining the receiver and the parameter resolver. - * The resulting composite resolver will be flat, so if either the receiver or the parameter resolver already - * is a composite, the resulting composite will aggregate the children in a flat manner. - */ -@ExternalKotlinTargetApi -operator fun IdeDependencyResolver.plus(other: IdeDependencyResolver): IdeDependencyResolver { - if (this is IdeCompositeDependencyResolver && other is IdeCompositeDependencyResolver) - return IdeCompositeDependencyResolver(this.children + other.children) - - if (this is IdeCompositeDependencyResolver) { - return IdeCompositeDependencyResolver(this.children + other) - } - - if (other is IdeCompositeDependencyResolver) { - return IdeCompositeDependencyResolver(listOf(this) + other.children) - } - return IdeCompositeDependencyResolver(listOf(this, other)) -} - private class IdeCompositeDependencyResolver( val children: List, ) : IdeDependencyResolver, IdeDependencyResolver.WithBuildDependencies { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer.kt index 88cb85736fe..ffcb315b9f8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer.kt @@ -51,27 +51,6 @@ fun IdeDependencyTransformer( vararg transformers: IdeDependencyTransformer? ): IdeDependencyTransformer = IdeDependencyTransformer(transformers.toList()) -/** - * Combines two [IdeDependencyResolver] into a single instance: - * This function will flatten the composite if either receiver or [other] transformer are already composite instances - */ -@ExternalKotlinTargetApi -operator fun IdeDependencyTransformer.plus(other: IdeDependencyTransformer): IdeDependencyTransformer { - if (this is IdeCompositeDependencyTransformer && other is IdeCompositeDependencyTransformer) { - return IdeCompositeDependencyTransformer(this.transformers + other.transformers) - } - - if (this is IdeCompositeDependencyTransformer) { - return IdeCompositeDependencyTransformer(this.transformers + other) - } - - if (other is IdeCompositeDependencyTransformer) { - return IdeCompositeDependencyTransformer(listOf(this) + other.transformers) - } - - return IdeCompositeDependencyTransformer(listOf(this, other)) -} - private class IdeCompositeDependencyTransformer( val transformers: List ) : IdeDependencyTransformer {