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

[kpm] Adapt ideaKpmFragmentBuilder.kt for new IdeaKpmSourceDirectory design

Browse Source 
^KT-52568 In Progress
This commit is contained in:
sebastian.sellmair
2022-06-13 14:24:34 +02:00
committed by Space
parent a380d15828
commit da288d926b
1 changed files with 4 additions and 4 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/kpm/idea/ideaKpmFragmentBuilder.kt
+4 -4
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.gradle.kpm.idea package org.jetbrains.kotlin.gradle.kpm.idea
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.* import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.*
import org.jetbrains.kotlin.tooling.core.emptyExtras
internal fun IdeaKpmProjectBuildingContext.IdeaKpmFragment(fragment: GradleKpmFragment): IdeaKpmFragment { internal fun IdeaKpmProjectBuildingContext.IdeaKpmFragment(fragment: GradleKpmFragment): IdeaKpmFragment {
return if (fragment is GradleKpmVariant) buildIdeaKpmVariant(fragment) return if (fragment is GradleKpmVariant) buildIdeaKpmVariant(fragment)
@@ -19,9 +18,10 @@ private fun IdeaKpmProjectBuildingContext.buildIdeaKpmFragment(fragment: GradleK
platforms = fragment.containingVariants.map { variant -> IdeaKpmPlatform(variant) }.toSet(), platforms = fragment.containingVariants.map { variant -> IdeaKpmPlatform(variant) }.toSet(),
languageSettings = IdeaKpmLanguageSettings(fragment.languageSettings), languageSettings = IdeaKpmLanguageSettings(fragment.languageSettings),
dependencies = dependencyResolver.resolve(fragment).toList(), dependencies = dependencyResolver.resolve(fragment).toList(),
sourceDirectories = fragment.kotlinSourceRoots.sourceDirectories.files.toList().map { file -> IdeaKpmSourceDirectoryImpl(file) }, sourceDirectories = fragment.kotlinSourceRoots.sourceDirectories.files.map { file ->
resourceDirectories = emptyList(), // TODO IdeaKpmSourceDirectoryImpl(file, type = IdeaKpmSourceDirectory.SOURCE_TYPE)
extras = emptyExtras() // TODO: Requires more sophisticated serialization },
extras = fragment.extras
) )
} }