From da288d926bbf96dcf67cc9f6d5f7e52efff1bcd5 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Mon, 13 Jun 2022 14:24:34 +0200 Subject: [PATCH] [kpm] Adapt ideaKpmFragmentBuilder.kt for new IdeaKpmSourceDirectory design ^KT-52568 In Progress --- .../kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt index 025a190ce19..f376e632d11 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.* -import org.jetbrains.kotlin.tooling.core.emptyExtras internal fun IdeaKpmProjectBuildingContext.IdeaKpmFragment(fragment: GradleKpmFragment): IdeaKpmFragment { 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(), languageSettings = IdeaKpmLanguageSettings(fragment.languageSettings), dependencies = dependencyResolver.resolve(fragment).toList(), - sourceDirectories = fragment.kotlinSourceRoots.sourceDirectories.files.toList().map { file -> IdeaKpmSourceDirectoryImpl(file) }, - resourceDirectories = emptyList(), // TODO - extras = emptyExtras() // TODO: Requires more sophisticated serialization + sourceDirectories = fragment.kotlinSourceRoots.sourceDirectories.files.map { file -> + IdeaKpmSourceDirectoryImpl(file, type = IdeaKpmSourceDirectory.SOURCE_TYPE) + }, + extras = fragment.extras ) }