Allow using strings to set native output kinds
This commit is contained in:
committed by
Ilya Matveev
parent
cfe7858229
commit
bef898509d
+27
-3
@@ -202,7 +202,9 @@ class KotlinWithJavaCompilation(
|
|||||||
|
|
||||||
override var runtimeDependencyFiles: FileCollection
|
override var runtimeDependencyFiles: FileCollection
|
||||||
get() = javaSourceSet.runtimeClasspath
|
get() = javaSourceSet.runtimeClasspath
|
||||||
set(value) { javaSourceSet.runtimeClasspath = value }
|
set(value) {
|
||||||
|
javaSourceSet.runtimeClasspath = value
|
||||||
|
}
|
||||||
|
|
||||||
override val runtimeDependencyConfigurationName: String
|
override val runtimeDependencyConfigurationName: String
|
||||||
get() = javaSourceSet.runtimeClasspathConfigurationName
|
get() = javaSourceSet.runtimeClasspathConfigurationName
|
||||||
@@ -227,7 +229,9 @@ class KotlinWithJavaCompilation(
|
|||||||
|
|
||||||
override var compileDependencyFiles: FileCollection
|
override var compileDependencyFiles: FileCollection
|
||||||
get() = javaSourceSet.compileClasspath
|
get() = javaSourceSet.compileClasspath
|
||||||
set(value) { javaSourceSet.compileClasspath = value }
|
set(value) {
|
||||||
|
javaSourceSet.compileClasspath = value
|
||||||
|
}
|
||||||
|
|
||||||
fun source(javaSourceSet: SourceSet) {
|
fun source(javaSourceSet: SourceSet) {
|
||||||
with(target.project) {
|
with(target.project) {
|
||||||
@@ -242,7 +246,7 @@ class KotlinJvmAndroidCompilation(
|
|||||||
target: KotlinAndroidTarget,
|
target: KotlinAndroidTarget,
|
||||||
name: String,
|
name: String,
|
||||||
override val output: SourceSetOutput
|
override val output: SourceSetOutput
|
||||||
): AbstractKotlinCompilationToRunnableFiles(target, name)
|
) : AbstractKotlinCompilationToRunnableFiles(target, name)
|
||||||
|
|
||||||
class KotlinJsCompilation(
|
class KotlinJsCompilation(
|
||||||
target: KotlinTarget,
|
target: KotlinTarget,
|
||||||
@@ -288,6 +292,26 @@ class KotlinNativeCompilation(
|
|||||||
var buildTypes = mutableListOf<NativeBuildType>()
|
var buildTypes = mutableListOf<NativeBuildType>()
|
||||||
var outputKinds = mutableListOf<NativeOutputKind>()
|
var outputKinds = mutableListOf<NativeOutputKind>()
|
||||||
|
|
||||||
|
fun outputKind(kind: NativeOutputKind) = outputKinds.add(kind)
|
||||||
|
|
||||||
|
fun outputKinds(vararg kinds: NativeOutputKind) {
|
||||||
|
outputKinds = kinds.toMutableList()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun outputKinds(vararg kinds: String) {
|
||||||
|
outputKinds = kinds.map { NativeOutputKind.valueOf(it.toUpperCase()) }.toMutableList()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun outputKinds(kinds: List<Any>) {
|
||||||
|
outputKinds = kinds.map {
|
||||||
|
when (it) {
|
||||||
|
is NativeOutputKind -> it
|
||||||
|
is String -> NativeOutputKind.valueOf(it.toUpperCase())
|
||||||
|
else -> error("Cannot use $it as an output kind")
|
||||||
|
}
|
||||||
|
}.toMutableList()
|
||||||
|
}
|
||||||
|
|
||||||
// Naming
|
// Naming
|
||||||
|
|
||||||
override val compileDependencyConfigurationName: String
|
override val compileDependencyConfigurationName: String
|
||||||
|
|||||||
Reference in New Issue
Block a user