[KPM] Move Idea* models to Set/List over Collection
KT-51262 KT-51220
This commit is contained in:
committed by
Space
parent
11d408f71e
commit
05259ddfa1
+9
-9
@@ -56,13 +56,13 @@ public abstract interface class org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinC
|
|||||||
}
|
}
|
||||||
|
|
||||||
public abstract interface class org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinFragment : java/io/Serializable {
|
public abstract interface class org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinFragment : java/io/Serializable {
|
||||||
public abstract fun getDependencies ()Ljava/util/Collection;
|
public abstract fun getDependencies ()Ljava/util/List;
|
||||||
public abstract fun getDirectRefinesDependencies ()Ljava/util/Collection;
|
public abstract fun getDirectRefinesDependencies ()Ljava/util/List;
|
||||||
public abstract fun getExternal ()Lorg/jetbrains/kotlin/gradle/kpm/KotlinExternalModelContainer;
|
public abstract fun getExternal ()Lorg/jetbrains/kotlin/gradle/kpm/KotlinExternalModelContainer;
|
||||||
public abstract fun getLanguageSettings ()Lorg/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinLanguageSettings;
|
public abstract fun getLanguageSettings ()Lorg/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinLanguageSettings;
|
||||||
public abstract fun getName ()Ljava/lang/String;
|
public abstract fun getName ()Ljava/lang/String;
|
||||||
public abstract fun getResourceDirectories ()Ljava/util/Collection;
|
public abstract fun getResourceDirectories ()Ljava/util/List;
|
||||||
public abstract fun getSourceDirectories ()Ljava/util/Collection;
|
public abstract fun getSourceDirectories ()Ljava/util/List;
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract interface class org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinFragmentDependency : java/io/Serializable {
|
public abstract interface class org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinFragmentDependency : java/io/Serializable {
|
||||||
@@ -70,12 +70,12 @@ public abstract interface class org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinF
|
|||||||
|
|
||||||
public abstract interface class org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinLanguageSettings : java/io/Serializable {
|
public abstract interface class org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinLanguageSettings : java/io/Serializable {
|
||||||
public abstract fun getApiVersion ()Ljava/lang/String;
|
public abstract fun getApiVersion ()Ljava/lang/String;
|
||||||
public abstract fun getCompilerPluginArguments ()Ljava/util/Collection;
|
public abstract fun getCompilerPluginArguments ()Ljava/util/List;
|
||||||
public abstract fun getCompilerPluginClasspath ()Ljava/util/Collection;
|
public abstract fun getCompilerPluginClasspath ()Ljava/util/List;
|
||||||
public abstract fun getEnabledLanguageFeatures ()Ljava/util/Collection;
|
public abstract fun getEnabledLanguageFeatures ()Ljava/util/Set;
|
||||||
public abstract fun getFreeCompilerArgs ()Ljava/util/Collection;
|
public abstract fun getFreeCompilerArgs ()Ljava/util/List;
|
||||||
public abstract fun getLanguageVersion ()Ljava/lang/String;
|
public abstract fun getLanguageVersion ()Ljava/lang/String;
|
||||||
public abstract fun getOptInAnnotationsInUse ()Ljava/util/Collection;
|
public abstract fun getOptInAnnotationsInUse ()Ljava/util/Set;
|
||||||
public abstract fun isProgressiveMode ()Z
|
public abstract fun isProgressiveMode ()Z
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+8
-8
@@ -11,10 +11,10 @@ import java.io.Serializable
|
|||||||
interface IdeaKotlinFragment : Serializable {
|
interface IdeaKotlinFragment : Serializable {
|
||||||
val name: String
|
val name: String
|
||||||
val languageSettings: IdeaKotlinLanguageSettings?
|
val languageSettings: IdeaKotlinLanguageSettings?
|
||||||
val dependencies: Collection<IdeaKotlinFragmentDependency>
|
val dependencies: List<IdeaKotlinFragmentDependency>
|
||||||
val directRefinesDependencies: Collection<IdeaKotlinFragment>
|
val directRefinesDependencies: List<IdeaKotlinFragment>
|
||||||
val sourceDirectories: Collection<IdeaKotlinSourceDirectory>
|
val sourceDirectories: List<IdeaKotlinSourceDirectory>
|
||||||
val resourceDirectories: Collection<IdeaKotlinResourceDirectory>
|
val resourceDirectories: List<IdeaKotlinResourceDirectory>
|
||||||
val external: KotlinExternalModelContainer
|
val external: KotlinExternalModelContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22,10 +22,10 @@ interface IdeaKotlinFragment : Serializable {
|
|||||||
data class IdeaKotlinFragmentImpl(
|
data class IdeaKotlinFragmentImpl(
|
||||||
override val name: String,
|
override val name: String,
|
||||||
override val languageSettings: IdeaKotlinLanguageSettings?,
|
override val languageSettings: IdeaKotlinLanguageSettings?,
|
||||||
override val dependencies: Collection<IdeaKotlinFragmentDependency>,
|
override val dependencies: List<IdeaKotlinFragmentDependency>,
|
||||||
override val directRefinesDependencies: Collection<IdeaKotlinFragment>,
|
override val directRefinesDependencies: List<IdeaKotlinFragment>,
|
||||||
override val sourceDirectories: Collection<IdeaKotlinSourceDirectory>,
|
override val sourceDirectories: List<IdeaKotlinSourceDirectory>,
|
||||||
override val resourceDirectories: Collection<IdeaKotlinResourceDirectory>,
|
override val resourceDirectories: List<IdeaKotlinResourceDirectory>,
|
||||||
override val external: KotlinExternalModelContainer
|
override val external: KotlinExternalModelContainer
|
||||||
) : IdeaKotlinFragment {
|
) : IdeaKotlinFragment {
|
||||||
|
|
||||||
|
|||||||
+10
-10
@@ -12,11 +12,11 @@ interface IdeaKotlinLanguageSettings : Serializable {
|
|||||||
val languageVersion: String?
|
val languageVersion: String?
|
||||||
val apiVersion: String?
|
val apiVersion: String?
|
||||||
val isProgressiveMode: Boolean
|
val isProgressiveMode: Boolean
|
||||||
val enabledLanguageFeatures: Collection<String>
|
val enabledLanguageFeatures: Set<String>
|
||||||
val optInAnnotationsInUse: Collection<String>
|
val optInAnnotationsInUse: Set<String>
|
||||||
val compilerPluginArguments: Collection<String>
|
val compilerPluginArguments: List<String>
|
||||||
val compilerPluginClasspath: Collection<File>
|
val compilerPluginClasspath: List<File>
|
||||||
val freeCompilerArgs: Collection<String>
|
val freeCompilerArgs: List<String>
|
||||||
}
|
}
|
||||||
|
|
||||||
@InternalKotlinGradlePluginApi
|
@InternalKotlinGradlePluginApi
|
||||||
@@ -24,11 +24,11 @@ data class IdeaKotlinLanguageSettingsImpl(
|
|||||||
override val languageVersion: String?,
|
override val languageVersion: String?,
|
||||||
override val apiVersion: String?,
|
override val apiVersion: String?,
|
||||||
override val isProgressiveMode: Boolean,
|
override val isProgressiveMode: Boolean,
|
||||||
override val enabledLanguageFeatures: Collection<String>,
|
override val enabledLanguageFeatures: Set<String>,
|
||||||
override val optInAnnotationsInUse: Collection<String>,
|
override val optInAnnotationsInUse: Set<String>,
|
||||||
override val compilerPluginArguments: Collection<String>,
|
override val compilerPluginArguments: List<String>,
|
||||||
override val compilerPluginClasspath: Collection<File>,
|
override val compilerPluginClasspath: List<File>,
|
||||||
override val freeCompilerArgs: Collection<String>
|
override val freeCompilerArgs: List<String>
|
||||||
) : IdeaKotlinLanguageSettings {
|
) : IdeaKotlinLanguageSettings {
|
||||||
|
|
||||||
@InternalKotlinGradlePluginApi
|
@InternalKotlinGradlePluginApi
|
||||||
|
|||||||
Reference in New Issue
Block a user