luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3380 from eed3si9n/wip/skipinpublish 

implement `skip in publish`
This commit is contained in:
eugene yokota 2017-07-28 18:46:03 -04:00 committed by GitHub
parent 716203fefa 5e8bbf8d0d
commit b38dbc3618
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/src/main/scala/sbt/Defaults.scala
View File

@ -2158,16 +2158,26 @@ object Classpaths {
classifiers.toVector classifiers.toVector
) )
} }
def deliverTask(config: TaskKey[PublishConfiguration]): Initialize[Task[File]] = def deliverTask(config: TaskKey[PublishConfiguration]): Initialize[Task[File]] =
Def.task { Def.task {
val _ = update.value val _ = update.value
IvyActions.deliver(ivyModule.value, config.value, streams.value.log) IvyActions.deliver(ivyModule.value, config.value, streams.value.log)
} }
def publishTask(config: TaskKey[PublishConfiguration], def publishTask(config: TaskKey[PublishConfiguration],
deliverKey: TaskKey[_]): Initialize[Task[Unit]] = deliverKey: TaskKey[_]): Initialize[Task[Unit]] =
Def.task { Def.taskDyn {
IvyActions.publish(ivyModule.value, config.value, streams.value.log) val s = streams.value
val skp = (skip in publish).value
val ref = thisProjectRef.value
if (skp) Def.task { s.log.debug(s"Skipping publish* for ${ref.project}") }
else Def.task {
val cfg = config.value
IvyActions.publish(ivyModule.value, config.value, s.log)
}
} tag (Tags.Publish, Tags.Network) } tag (Tags.Publish, Tags.Network)
val moduleIdJsonKeyFormat: sjsonnew.JsonKeyFormat[ModuleID] = val moduleIdJsonKeyFormat: sjsonnew.JsonKeyFormat[ModuleID] =
new sjsonnew.JsonKeyFormat[ModuleID] { new sjsonnew.JsonKeyFormat[ModuleID] {
import sjsonnew.support.scalajson.unsafe._ import sjsonnew.support.scalajson.unsafe._