mirror of https://github.com/sbt/sbt.git
Merge pull request #180 from eed3si9n/wip/fatal-warnings
Fix 2.10 build
This commit is contained in:
commit
69d6b3aeb8
14
.travis.yml
14
.travis.yml
|
|
@ -3,12 +3,7 @@ jdk: oraclejdk8
|
||||||
|
|
||||||
scala:
|
scala:
|
||||||
- 2.11.12
|
- 2.11.12
|
||||||
- 2.12.4
|
- 2.12.6
|
||||||
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- scala: 2.12.4
|
|
||||||
jdk: oraclejdk9
|
|
||||||
|
|
||||||
script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M
|
script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M
|
||||||
++$TRAVIS_SCALA_VERSION
|
++$TRAVIS_SCALA_VERSION
|
||||||
|
|
@ -17,6 +12,13 @@ script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M
|
||||||
whitesourceCheckPolicies
|
whitesourceCheckPolicies
|
||||||
test
|
test
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- scala: 2.12.6
|
||||||
|
jdk: oraclejdk9
|
||||||
|
- scala: 2.10.6
|
||||||
|
script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "++$TRAVIS_SCALA_VERSION compile"
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
- secure: JzxepvrNQIem+7MS8pBfBkcWDgt/oNKOreI3GJMJDN9P7lxCmrW0UVhpSftscjRzz9gXGQleqZ8t/I0hqysY9nO/DlxDQil6FKpsqrEKALdIsez8TjtbOlV69enDl6SBCXpg1B/rTQ/dL9mpV3WMvNkmDOhcNmbNyfO9Uk8wAAEvGQNKyE02s0gjZf6IgfOHXInBB2o3+uQFiWCABFHDWInN4t0QZVEhF/3P3iDKEfauWGwugf/YKLrwUUzNyN+J1i1goYEWZvviP+KCNbPlEsVN60In8F0t+jYuBJb0ePNcl3waT/4xBKQRidB4XRbhOXrZIATdpHLnzKzk2TPf3GxijNEscKYGdq3v6nWd128rfHGYz528pRSZ8bNOdQJotB/bJTmIEOnk5P9zU0z4z2cawMF6EyBJka7kXnC9Vz6TpifvyXDpzfmRzAkBrD6PC+diGPbyy5+4zvhpZuv31MRjMckohyNb76pR9qq70yDlomn+nVNoZ1fpp7dCqwjIxm9h2UjCWzXWY4xSByI8/CaPibq6Ma7RWHQE+4NGG2CCLQrqN4NB+BFsH3R0l5Js9khvDuEUYJkgSmJMFluXranWRV+pp/YMxk1IT4rOEPOc/hIqlQTrxasp/QxeyAfRk9OPzoz9L2kR0RH4ch3KuaARUv03WFNarfQ/ISz3P/s=
|
- secure: JzxepvrNQIem+7MS8pBfBkcWDgt/oNKOreI3GJMJDN9P7lxCmrW0UVhpSftscjRzz9gXGQleqZ8t/I0hqysY9nO/DlxDQil6FKpsqrEKALdIsez8TjtbOlV69enDl6SBCXpg1B/rTQ/dL9mpV3WMvNkmDOhcNmbNyfO9Uk8wAAEvGQNKyE02s0gjZf6IgfOHXInBB2o3+uQFiWCABFHDWInN4t0QZVEhF/3P3iDKEfauWGwugf/YKLrwUUzNyN+J1i1goYEWZvviP+KCNbPlEsVN60In8F0t+jYuBJb0ePNcl3waT/4xBKQRidB4XRbhOXrZIATdpHLnzKzk2TPf3GxijNEscKYGdq3v6nWd128rfHGYz528pRSZ8bNOdQJotB/bJTmIEOnk5P9zU0z4z2cawMF6EyBJka7kXnC9Vz6TpifvyXDpzfmRzAkBrD6PC+diGPbyy5+4zvhpZuv31MRjMckohyNb76pR9qq70yDlomn+nVNoZ1fpp7dCqwjIxm9h2UjCWzXWY4xSByI8/CaPibq6Ma7RWHQE+4NGG2CCLQrqN4NB+BFsH3R0l5Js9khvDuEUYJkgSmJMFluXranWRV+pp/YMxk1IT4rOEPOc/hIqlQTrxasp/QxeyAfRk9OPzoz9L2kR0RH4ch3KuaARUv03WFNarfQ/ISz3P/s=
|
||||||
|
|
|
||||||
|
|
@ -101,9 +101,12 @@ lazy val utilLogging = (project in internalPath / "util-logging")
|
||||||
crossScalaVersions := Seq(scala210, scala211, scala212),
|
crossScalaVersions := Seq(scala210, scala211, scala212),
|
||||||
name := "Util Logging",
|
name := "Util Logging",
|
||||||
libraryDependencies ++=
|
libraryDependencies ++=
|
||||||
Seq(jline, log4jApi, log4jCore, disruptor, sjsonnewScalaJson.value, scalaReflect.value,
|
Seq(jline, log4jApi, log4jCore, disruptor, sjsonnewScalaJson.value, scalaReflect.value),
|
||||||
compilerPlugin(silencerPlugin), silencerLib),
|
|
||||||
libraryDependencies ++= Seq(scalaCheck, scalaTest),
|
libraryDependencies ++= Seq(scalaCheck, scalaTest),
|
||||||
|
libraryDependencies ++= (scalaVersion.value match {
|
||||||
|
case v if v.startsWith("2.12.") => List(compilerPlugin(silencerPlugin))
|
||||||
|
case _ => List()
|
||||||
|
}),
|
||||||
Compile / scalacOptions ++= (scalaVersion.value match {
|
Compile / scalacOptions ++= (scalaVersion.value match {
|
||||||
case v if v.startsWith("2.12.") => List("-Ywarn-unused:-locals,-explicits,-privates")
|
case v if v.startsWith("2.12.") => List("-Ywarn-unused:-locals,-explicits,-privates")
|
||||||
case _ => List()
|
case _ => List()
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
package com.github.ghik.silencer
|
||||||
|
|
||||||
|
import scala.annotation.Annotation
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When silencer compiler plugin is enabled, this annotation suppresses all warnings emitted by scalac for some portion
|
||||||
|
* of source code. It can be applied on any definition (`class`, def`, `val`, `var`, etc.) or on arbitrary expression,
|
||||||
|
* e.g. {123; 456}: @silent`
|
||||||
|
*/
|
||||||
|
class silent extends Annotation
|
||||||
|
|
@ -43,6 +43,7 @@ class BufferedAppender private[BufferedAppender] (name: String, delegate: Append
|
||||||
if (recording) {
|
if (recording) {
|
||||||
buffer += event.toImmutable
|
buffer += event.toImmutable
|
||||||
} else delegate.append(event)
|
} else delegate.append(event)
|
||||||
|
()
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Enables buffering. */
|
/** Enables buffering. */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue