From 74fb5cde9a71b4513d60962a08753064b19037fb Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 4 May 2019 01:17:44 -0400 Subject: [PATCH 1/2] Bump sbt-whitesource --- project/build.properties | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/build.properties b/project/build.properties index c0bab0494..c59667ce9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.3.0-M3 diff --git a/project/plugins.sbt b/project/plugins.sbt index 70d7318b3..b8ef994f4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") From 96c91bb2a13d6c4ca13738da44dd9aea6e60b77d Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 4 May 2019 02:23:55 -0400 Subject: [PATCH 2/2] Drop 2.10 cross building --- .travis.yml | 2 -- build.sbt | 2 +- project/Dependencies.scala | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d6dc44b30..391862182 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/build.sbt b/build.sbt index e1f77c2b9..2a1f47f2a 100644 --- a/build.sbt +++ b/build.sbt @@ -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), diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 74d510024..957313074 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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"