From b87fb4627e8d8fc9b0e97b80eb9c86ba3aa21487 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 24 Dec 2015 02:02:20 -0500 Subject: [PATCH 1/2] Update util to 0.1.0-M8 --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f07eb3e1d..9c78cc053 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,11 +2,11 @@ import sbt._ import Keys._ object Dependencies { - lazy val scala210 = "2.10.5" + lazy val scala210 = "2.10.6" lazy val scala211 = "2.11.7" - val utilVersion = "0.1.0-M5" val ioVersion = "1.0.0-M3" + val utilVersion = "0.1.0-M8" lazy val sbtIO = "org.scala-sbt" %% "io" % ioVersion lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion lazy val utilLogging = "org.scala-sbt" %% "util-logging" % utilVersion From 84e7c5a360d724990ffed2d7ea4bff6af52c8f87 Mon Sep 17 00:00:00 2001 From: Martin Duhem Date: Thu, 24 Dec 2015 09:07:02 +0100 Subject: [PATCH 2/2] Bump Scala version in .travis.yml and build.sbt --- .travis.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a5b73c0d8..8dc242caf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: scala scala: - - 2.10.5 + - 2.10.6 - 2.11.7 diff --git a/build.sbt b/build.sbt index 47d78deb5..ed06b97a0 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ def baseVersion = "0.1.0" def internalPath = file("internal") def commonSettings: Seq[Setting[_]] = Seq( - scalaVersion := "2.10.5", + scalaVersion := scala210, // publishArtifact in packageDoc := false, resolvers += Resolver.typesafeIvyRepo("releases"), resolvers += Resolver.sonatypeRepo("snapshots"),