From 3d8ee5bae588416f35bd632579eb232b7e4b004a Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Fri, 20 Jan 2023 10:25:58 +0100 Subject: [PATCH] [Gradle][Minor] ProjectMppDependencyProjectStructureMetadataExtractor: Remove unnecessary constructor KT-49933 --- ...ndencyProjectStructureMetadataExtractor.kt | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MppDependencyProjectStructureMetadataExtractor.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MppDependencyProjectStructureMetadataExtractor.kt index ecf162a2087..d6a3c800cd9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MppDependencyProjectStructureMetadataExtractor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MppDependencyProjectStructureMetadataExtractor.kt @@ -5,13 +5,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp -import org.gradle.api.Project import org.gradle.api.artifacts.component.ProjectComponentIdentifier -import org.jetbrains.kotlin.gradle.dsl.multiplatformExtensionOrNull -import org.jetbrains.kotlin.gradle.dsl.pm20Extension -import org.jetbrains.kotlin.gradle.dsl.pm20ExtensionOrNull -import org.jetbrains.kotlin.gradle.dsl.topLevelExtensionOrNull - import org.jetbrains.kotlin.project.model.KpmModuleIdentifier import java.io.File import java.io.InputStream @@ -30,25 +24,9 @@ internal class ProjectMppDependencyProjectStructureMetadataExtractor( private val projectStructureMetadataProvider: () -> KotlinProjectStructureMetadata? ) : MppDependencyProjectStructureMetadataExtractor() { - constructor( - moduleIdentifier: KpmModuleIdentifier, - dependencyProject: Project - ): this(moduleIdentifier, dependencyProject.path, { dependencyProject.getProjectStructureMetadata(moduleIdentifier) }) - override fun getProjectStructureMetadata(): KotlinProjectStructureMetadata? = projectStructureMetadataProvider() } -private fun Project.getProjectStructureMetadata(moduleIdentifier: KpmModuleIdentifier): KotlinProjectStructureMetadata? { - return when { - topLevelExtensionOrNull == null -> null - pm20ExtensionOrNull != null -> buildProjectStructureMetadata( - pm20Extension.modules.single { it.moduleIdentifier == moduleIdentifier } - ) - - else -> multiplatformExtensionOrNull?.kotlinProjectStructureMetadata - } -} - internal open class JarMppDependencyProjectStructureMetadataExtractor( val primaryArtifactFile: File ) : MppDependencyProjectStructureMetadataExtractor() {