Skip to content

Commit b074c40

Browse files
authored
Merge pull request #485 from ingarabr/tag-task
feat: tag assemly task
2 parents 1a529bc + a04849b commit b074c40

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/main/scala/sbtassembly/Assembly.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import sbt.util.FileInfo.lastModified
1212
import sbt.util.Tracked.{ inputChanged, lastOutput }
1313
import sbt.util.{ FilesInfo, Level, ModifiedFileInfo }
1414
import sbt.{ File, Logger, _ }
15+
import sbt.Tags.Tag
1516
import CacheImplicits._
1617
import sbtassembly.AssemblyPlugin.autoImport.{ Assembly => _, _ }
1718
import sbtassembly.PluginCompat.ClasspathUtilities
@@ -40,6 +41,8 @@ object Assembly {
4041
val indent: String = " " * 2
4142
val newLineIndented: String = newLine + indent
4243

44+
val assemblyTag = Tag("assembly")
45+
4346
private[sbtassembly] type CacheKey = FilesInfo[ModifiedFileInfo] :+:
4447
Map[String, (Boolean, String)] :+: // map of target paths that matched a merge strategy
4548
JManifest :+:
@@ -192,7 +195,7 @@ object Assembly {
192195
s.cacheDirectory,
193196
s.log
194197
)
195-
}
198+
}.tag(assemblyTag)
196199

197200
/**
198201
* Builds an assembly jar

src/main/scala/sbtassembly/AssemblyPlugin.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ object AssemblyPlugin extends sbt.AutoPlugin {
3636
assemblyAppendContentHash := false,
3737
assemblyPrependShellScript := None,
3838
assemblyCacheOutput := true,
39-
assemblyRepeatableBuild := true
39+
assemblyRepeatableBuild := true,
40+
concurrentRestrictions += Tags.limit(Assembly.assemblyTag, 1)
4041
)
4142

4243
override lazy val projectSettings: Seq[Def.Setting[_]] = assemblySettings

0 commit comments

Comments
 (0)