Merge pull request #198 from eed3si9n/wip/plugins2

Bump sbt-whitesource
This commit is contained in:
eugene yokota 2019-05-04 02:31:29 -04:00 committed by GitHub
commit 6e9a8241d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 6 deletions

View File

@ -16,8 +16,6 @@ matrix:
include:
- scala: 2.12.7
jdk: openjdk11
- scala: 2.10.6
script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "++$TRAVIS_SCALA_VERSION compile"
env:
global:

View File

@ -93,7 +93,7 @@ lazy val utilLogging = (project in internalPath / "util-logging")
.dependsOn(utilInterface)
.settings(
commonSettings,
crossScalaVersions := Seq(scala210, scala211, scala212),
crossScalaVersions := Seq(scala211, scala212),
name := "Util Logging",
libraryDependencies ++=
Seq(jline, log4jApi, log4jCore, disruptor, sjsonnewScalaJson.value, scalaReflect.value),

View File

@ -3,7 +3,6 @@ import Keys._
import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies {
val scala210 = "2.10.7"
val scala211 = "2.11.12"
val scala212 = "2.12.8"

View File

@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.3.0-M3

View File

@ -1,5 +1,5 @@
addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.9")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0")
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.1")
addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.9")
addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.14")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4")