From d03a85525d60143caaed8e2b534608efa397f38e Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Mon, 15 Mar 2021 16:23:50 +0100 Subject: [PATCH] [Commonizer] DependencyLibrariesOptionType: Make option optional (default: empty) --- .../descriptors/commonizer/cli/DependencyLibrariesOptionType.kt | 2 +- .../jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/DependencyLibrariesOptionType.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/DependencyLibrariesOptionType.kt index 6b8dfbc284a..39beb98cda7 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/DependencyLibrariesOptionType.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/DependencyLibrariesOptionType.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.cli internal object DependencyLibrariesOptionType : LibrariesSetOptionType( - mandatory = true, + mandatory = false, alias = "dependency-libraries", description = "';' separated list of klib file paths that can be used as dependency" ) diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt index 37810ab8a1b..0b7f5d97d81 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt @@ -47,7 +47,7 @@ internal class NativeKlibCommonize(options: Collection>) : Task(option val distribution = KonanDistribution(getMandatory()) val destination = getMandatory() val targetLibraries = getMandatory, InputLibrariesOptionType>() - val dependencyLibraries = getMandatory, DependencyLibrariesOptionType>() + val dependencyLibraries = getOptional, DependencyLibrariesOptionType>().orEmpty() val outputCommonizerTarget = getMandatory() val statsType = getOptional { it == "log-stats" } ?: StatsType.NONE