azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Commonizer] DependencyLibrariesOptionType: Make option optional (default: empty)

Browse Source
This commit is contained in:
sebastian.sellmair
2021-03-15 16:23:50 +01:00
committed by Space
parent 73222fbc4f
commit d03a85525d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/DependencyLibrariesOptionType.kt
+1 -1
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.descriptors.commonizer.cli package org.jetbrains.kotlin.descriptors.commonizer.cli
internal object DependencyLibrariesOptionType : LibrariesSetOptionType( internal object DependencyLibrariesOptionType : LibrariesSetOptionType(
mandatory = true, mandatory = false,
alias = "dependency-libraries", alias = "dependency-libraries",
description = "';' separated list of klib file paths that can be used as dependency" description = "';' separated list of klib file paths that can be used as dependency"
) )
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt
+1 -1
View File
@@ -47,7 +47,7 @@ internal class NativeKlibCommonize(options: Collection<Option<*>>) : Task(option
val distribution = KonanDistribution(getMandatory<File, NativeDistributionOptionType>()) val distribution = KonanDistribution(getMandatory<File, NativeDistributionOptionType>())
val destination = getMandatory<File, OutputOptionType>() val destination = getMandatory<File, OutputOptionType>()
val targetLibraries = getMandatory<List<File>, InputLibrariesOptionType>() val targetLibraries = getMandatory<List<File>, InputLibrariesOptionType>()
val dependencyLibraries = getMandatory<List<File>, DependencyLibrariesOptionType>() val dependencyLibraries = getOptional<List<File>, DependencyLibrariesOptionType>().orEmpty()
val outputCommonizerTarget = getMandatory<SharedCommonizerTarget, OutputCommonizerTargetOptionType>() val outputCommonizerTarget = getMandatory<SharedCommonizerTarget, OutputCommonizerTargetOptionType>()
val statsType = getOptional<StatsType, StatsTypeOptionType> { it == "log-stats" } ?: StatsType.NONE val statsType = getOptional<StatsType, StatsTypeOptionType> { it == "log-stats" } ?: StatsType.NONE