From 7486a11bd1a5131a4e3a305da24e54942b31e7b6 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Tue, 25 Apr 2023 13:24:02 +0200 Subject: [PATCH] [Gradle] Remove deprecated dependsOnClosure and withDependsOnClosure extensions ^KT-58220 Verification Pending --- .../kotlin/gradle/internal/stdlibDependencyManagement.kt | 8 +++++--- .../gradle/plugin/sources/DefaultKotlinSourceSet.kt | 8 -------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/stdlibDependencyManagement.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/stdlibDependencyManagement.kt index 96f8392a40b..bd59a0bd72a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/stdlibDependencyManagement.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/stdlibDependencyManagement.kt @@ -17,12 +17,14 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget import org.jetbrains.kotlin.gradle.plugin.mpp.isTest -import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.* +import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment +import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmModule +import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension import org.jetbrains.kotlin.gradle.plugin.sources.KotlinDependencyScope import org.jetbrains.kotlin.gradle.plugin.sources.android.AndroidBaseSourceSetName import org.jetbrains.kotlin.gradle.plugin.sources.android.AndroidVariantType import org.jetbrains.kotlin.gradle.plugin.sources.android.androidSourceSetInfoOrNull -import org.jetbrains.kotlin.gradle.plugin.sources.dependsOnClosure +import org.jetbrains.kotlin.gradle.plugin.sources.internal import org.jetbrains.kotlin.gradle.plugin.sources.sourceSetDependencyConfigurationByScope import org.jetbrains.kotlin.gradle.targets.js.npm.SemVer import org.jetbrains.kotlin.gradle.utils.withType @@ -165,7 +167,7 @@ private fun KotlinTarget.addStdlibDependency( isStdlibAddedByUser( configurations, setOf(stdlibModule), - *kotlinSourceSet.dependsOnClosure.toTypedArray() + *kotlinSourceSet.internal.dependsOnClosure.toTypedArray() ) ) return@withDependencies diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt index c7d3382f17d..b440dababa1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt @@ -204,14 +204,6 @@ internal fun KotlinSourceSet.disambiguateName(simpleName: String): String { internal fun createDefaultSourceDirectorySet(project: Project, name: String?): SourceDirectorySet = project.objects.sourceDirectorySet(name!!, name) -@Suppress("Unused") // Still part of public API -@Deprecated("Use InternalKotlinSourceSet.dependsOnClosure instead. Will be removed in Kotlin 1.9") -val KotlinSourceSet.dependsOnClosure: Set get() = this.internal.dependsOnClosure - -@Suppress("Unused") // Still part of public API -@Deprecated("Use InternalKotlinSourceSet.withDependsOnClosure instead. Will be removed in Kotlin 1.9") -val KotlinSourceSet.withDependsOnClosure: Set get() = this.internal.withDependsOnClosure - val Iterable.dependsOnClosure: Set get() = flatMap { it.internal.dependsOnClosure }.toSet() - this.toSet()