azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Remove IdeDependencyResolver and IdeDependencyTransformer .plus methods

Browse Source 
KT-58601
This commit is contained in:
Sebastian Sellmair
2023-05-10 11:53:35 +02:00
committed by Space Team
parent 68814ccd67
commit 82ac61e306
3 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api
-2
View File
@@ -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;
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver.kt
-21
View File
@@ -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, IdeDependencyResolver.WithBuildDependencies {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer.kt
-21
View File
@@ -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>
) : IdeDependencyTransformer {