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

[Gradle][Minor] ProjectMppDependencyProjectStructureMetadataExtractor: Remove unnecessary constructor

Browse Source 
KT-49933
This commit is contained in:
Sebastian Sellmair
2023-01-20 10:25:58 +01:00
committed by Space Team
parent 00bcaebd15
commit 3d8ee5bae5
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MppDependencyProjectStructureMetadataExtractor.kt
-22
View File
@@ -5,13 +5,7 @@
package org.jetbrains.kotlin.gradle.plugin.mpp package org.jetbrains.kotlin.gradle.plugin.mpp
import org.gradle.api.Project
import org.gradle.api.artifacts.component.ProjectComponentIdentifier 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 org.jetbrains.kotlin.project.model.KpmModuleIdentifier
import java.io.File import java.io.File
import java.io.InputStream import java.io.InputStream
@@ -30,25 +24,9 @@ internal class ProjectMppDependencyProjectStructureMetadataExtractor(
private val projectStructureMetadataProvider: () -> KotlinProjectStructureMetadata? private val projectStructureMetadataProvider: () -> KotlinProjectStructureMetadata?
) : MppDependencyProjectStructureMetadataExtractor() { ) : MppDependencyProjectStructureMetadataExtractor() {
constructor(
moduleIdentifier: KpmModuleIdentifier,
dependencyProject: Project
): this(moduleIdentifier, dependencyProject.path, { dependencyProject.getProjectStructureMetadata(moduleIdentifier) })
override fun getProjectStructureMetadata(): KotlinProjectStructureMetadata? = projectStructureMetadataProvider() 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( internal open class JarMppDependencyProjectStructureMetadataExtractor(
val primaryArtifactFile: File val primaryArtifactFile: File
) : MppDependencyProjectStructureMetadataExtractor() { ) : MppDependencyProjectStructureMetadataExtractor() {