diff options
| author | Guillaume R <theelectronwill@gmail.com> | 2019-07-24 02:10:00 +0200 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2019-07-24 08:10:00 +0800 |
| commit | 1f0d223c1de438071645c7788174fb708ca55043 (patch) | |
| tree | 9371d141c9a1ad3c50f7392055fed64d69f0e7e8 /scalalib/src/publish/settings.scala | |
| parent | bf9648c08fc8fc0c50f46ff4147d6bfe7f432bcf (diff) | |
| download | mill-1f0d223c1de438071645c7788174fb708ca55043.tar.gz mill-1f0d223c1de438071645c7788174fb708ca55043.tar.bz2 mill-1f0d223c1de438071645c7788174fb708ca55043.zip | |
Ease the declaration of optional dependencies + handle them in maven and ivy publications (#661)
* Add Dep.optional() to fix #603
* Publish optional dependencies as such
Diffstat (limited to 'scalalib/src/publish/settings.scala')
| -rw-r--r-- | scalalib/src/publish/settings.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scalalib/src/publish/settings.scala b/scalalib/src/publish/settings.scala index d2801752..d17b8e4a 100644 --- a/scalalib/src/publish/settings.scala +++ b/scalalib/src/publish/settings.scala @@ -28,7 +28,8 @@ object Artifact { dep.dep.version ), Scope.Compile, - if (dep.dep.configuration == "") None else Some(dep.dep.configuration.value), + dep.dep.optional, + if (dep.dep.configuration.isEmpty) None else Some(dep.dep.configuration.value), dep.dep.exclusions.toList.map{case (a, b) => (a.value, b.value)} ) } @@ -45,6 +46,7 @@ object Scope { case class Dependency( artifact: Artifact, scope: Scope, + optional: Boolean = false, configuration: Option[String] = None, exclusions: Seq[(String, String)] = Nil ) |