From 8154f7ab3789c521877e02f9c20e220088b1a296 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Thu, 27 Jul 2023 18:39:44 +0200
Subject: [PATCH] [Gradle] Remove adding stdlib to KPM modules

KPM is deprecated and scheduled for removal

^KT-59000 In Progress
---
 .../internal/stdlibDependencyManagement.kt    | 35 -------------------
 1 file changed, 35 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 cdf56c79195..f34f475c17d 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,9 +17,6 @@ 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.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
@@ -42,8 +39,6 @@ internal fun Project.configureStdlibDefaultDependency(
     coreLibrariesVersion: Provider<String>
 ) {
     when (topLevelExtension) {
-        is KotlinPm20ProjectExtension -> addStdlibToKpmProject(project, coreLibrariesVersion)
-
         is KotlinJsProjectExtension -> topLevelExtension.registerTargetObserver { target ->
             target?.addStdlibDependency(configurations, dependencies, coreLibrariesVersion)
         }
@@ -104,35 +99,6 @@ private fun Configuration.alignStdlibJvmVariantVersions(
     }
 }
 
-private fun addStdlibToKpmProject(
-    project: Project,
-    coreLibrariesVersion: Provider<String>
-) {
-    project.pm20Extension.modules.named(GradleKpmModule.MAIN_MODULE_NAME) { main ->
-        main.fragments.named(GradleKpmFragment.COMMON_FRAGMENT_NAME) { common ->
-            common.dependencies {
-                api(project.dependencies.kotlinDependency(KOTLIN_STDLIB_MODULE_NAME, coreLibrariesVersion.get()))
-            }
-        }
-        main.variants.configureEach { variant ->
-            val dependencyHandler = project.dependencies
-            val stdlibModule = when (variant.platformType) {
-                KotlinPlatformType.common -> error("variants are not expected to be common")
-                KotlinPlatformType.jvm -> KOTLIN_STDLIB_MODULE_NAME
-                KotlinPlatformType.js -> KOTLIN_STDLIB_MODULE_NAME
-                KotlinPlatformType.wasm -> KOTLIN_STDLIB_WASM_MODULE_NAME
-                KotlinPlatformType.androidJvm -> null // TODO: expect support on the AGP side?
-                KotlinPlatformType.native -> KOTLIN_STDLIB_MODULE_NAME
-            }
-            if (stdlibModule != null) {
-                variant.dependencies {
-                    api(dependencyHandler.kotlinDependency(stdlibModule, coreLibrariesVersion.get()))
-                }
-            }
-        }
-    }
-}
-
 private fun KotlinTarget.addStdlibDependency(
     configurations: ConfigurationContainer,
     dependencies: DependencyHandler,
@@ -162,7 +128,6 @@ private fun KotlinTarget.addStdlibDependency(
                     ?: return@withDependencies
 
                 // Check if stdlib module is added to SourceSets hierarchy
-                @Suppress("DEPRECATION")
                 if (
                     isStdlibAddedByUser(
                         configurations,