summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-05-17 15:42:27 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-05-17 15:42:27 +1000
commit512bf7a841a2c11723c6f4537a1d9ef401b88b9b (patch)
tree924f05971ba5d831d133ec4906588958ab8fc7ad /project
parentb3f8332cf399cd15067c879c8297c25598045883 (diff)
parent71a5bdaf57f90b46a6bed8af28deebb1174318c7 (diff)
downloadscala-512bf7a841a2c11723c6f4537a1d9ef401b88b9b.tar.gz
scala-512bf7a841a2c11723c6f4537a1d9ef401b88b9b.tar.bz2
scala-512bf7a841a2c11723c6f4537a1d9ef401b88b9b.zip
Merge pull request #5152 from retronym/topic/silencio
Eliminate major sources of daily noise in SBT build.
Diffstat (limited to 'project')
-rw-r--r--project/Quiet.scala33
-rw-r--r--project/plugins.sbt2
2 files changed, 34 insertions, 1 deletions
diff --git a/project/Quiet.scala b/project/Quiet.scala
new file mode 100644
index 0000000000..de30ebe6ab
--- /dev/null
+++ b/project/Quiet.scala
@@ -0,0 +1,33 @@
+import sbt._
+import Keys._
+
+object Quiet {
+ // Workaround SBT issue described:
+ //
+ // https://github.com/scala/scala-dev/issues/100
+ def silenceScalaBinaryVersionWarning = ivyConfiguration := {
+ ivyConfiguration.value match {
+ case c: InlineIvyConfiguration =>
+ val delegate = c.log
+ val logger = new Logger {
+ override def trace(t: => Throwable): Unit = delegate.trace(t)
+ override def log(level: sbt.Level.Value, message: => String): Unit = {
+ level match {
+ case sbt.Level.Warn =>
+ val message0 = message
+ val newLevel = if (message.contains("differs from Scala binary version in project"))
+ delegate.log(sbt.Level.Debug, message)
+ else
+ delegate.log(level, message)
+ case _ => delegate.log(level, message)
+ }
+ }
+ override def success(message: => String): Unit = delegate.success(message)
+ }
+ new InlineIvyConfiguration(c.paths, c.resolvers, c.otherResolvers, c.moduleConfigurations, c.localOnly, c.lock, c.checksums, c.resolutionCacheDir, c.updateOptions, logger)
+ case x => x
+ }
+ }
+
+ def silenceIvyUpdateInfoLogging = logLevel in update := Level.Warn
+}
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 2d91c2306b..46203565b4 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,6 @@
libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.3.2"
-libraryDependencies += "org.pantsbuild" % "jarjar" % "1.6.0"
+libraryDependencies += "org.pantsbuild" % "jarjar" % "1.6.3"
libraryDependencies += "biz.aQute" % "bndlib" % "1.50.0"