diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragment.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragment.kt index d20045fb657..2d8973a8dc6 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragment.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragment.kt @@ -11,10 +11,9 @@ import java.io.Serializable sealed interface IdeaKpmFragment : Serializable { val coordinates: IdeaKpmFragmentCoordinates val platforms: Set - val languageSettings: IdeaKpmLanguageSettings? + val languageSettings: IdeaKpmLanguageSettings val dependencies: List val sourceDirectories: List - val resourceDirectories: List val extras: Extras } @@ -24,10 +23,9 @@ val IdeaKpmFragment.name get() = coordinates.fragmentName data class IdeaKpmFragmentImpl( override val coordinates: IdeaKpmFragmentCoordinates, override val platforms: Set, - override val languageSettings: IdeaKpmLanguageSettings?, + override val languageSettings: IdeaKpmLanguageSettings, override val dependencies: List, override val sourceDirectories: List, - override val resourceDirectories: List, override val extras: Extras ) : IdeaKpmFragment { diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmResourceDirectory.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmResourceDirectory.kt deleted file mode 100644 index ef2ed87602c..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmResourceDirectory.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle.kpm.idea - -import java.io.File -import java.io.Serializable - -sealed interface IdeaKpmResourceDirectory : Serializable { - val file: File -} - -@InternalKotlinGradlePluginApi -data class IdeaKpmResourceDirectoryImpl( - override val file: File -) : IdeaKpmResourceDirectory { - - @InternalKotlinGradlePluginApi - companion object { - private const val serialVersionUID = 0L - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSourceDirectory.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSourceDirectory.kt index 188e0e085ef..8b3e9ae7b6c 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSourceDirectory.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSourceDirectory.kt @@ -5,17 +5,28 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.tooling.core.Extras +import org.jetbrains.kotlin.tooling.core.emptyExtras import java.io.File import java.io.Serializable sealed interface IdeaKpmSourceDirectory : Serializable { + val extras: Extras val file: File + val type: String + + companion object { + const val SOURCE_TYPE = "source" + const val RESOURCE_TYPE = "resource" + } } @InternalKotlinGradlePluginApi data class IdeaKpmSourceDirectoryImpl( override val file: File, -) : IdeaKpmSourceDirectory { + override val type: String, + override val extras: Extras = emptyExtras(), + ) : IdeaKpmSourceDirectory { @InternalKotlinGradlePluginApi companion object {