[kpm] kgp-idea: Remove IdeaKpmResourceDirectory in favor of a morge generic IdeaKpmSourceDirectory

^KT-52568 In Progress
This commit is contained in:
sebastian.sellmair
2022-06-13 13:59:57 +02:00
committed by Space
parent 7db9a4b0b1
commit 5f61b55abc
3 changed files with 14 additions and 29 deletions
@@ -11,10 +11,9 @@ import java.io.Serializable
sealed interface IdeaKpmFragment : Serializable {
val coordinates: IdeaKpmFragmentCoordinates
val platforms: Set<IdeaKpmPlatform>
val languageSettings: IdeaKpmLanguageSettings?
val languageSettings: IdeaKpmLanguageSettings
val dependencies: List<IdeaKpmDependency>
val sourceDirectories: List<IdeaKpmSourceDirectory>
val resourceDirectories: List<IdeaKpmResourceDirectory>
val extras: Extras
}
@@ -24,10 +23,9 @@ val IdeaKpmFragment.name get() = coordinates.fragmentName
data class IdeaKpmFragmentImpl(
override val coordinates: IdeaKpmFragmentCoordinates,
override val platforms: Set<IdeaKpmPlatform>,
override val languageSettings: IdeaKpmLanguageSettings?,
override val languageSettings: IdeaKpmLanguageSettings,
override val dependencies: List<IdeaKpmDependency>,
override val sourceDirectories: List<IdeaKpmSourceDirectory>,
override val resourceDirectories: List<IdeaKpmResourceDirectory>,
override val extras: Extras
) : IdeaKpmFragment {
@@ -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
}
}
@@ -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 {