From 07ccb1b50484c7b62f0fc2d463c75d9a6a8af2fe Mon Sep 17 00:00:00 2001 From: Will Sargent Date: Wed, 8 Mar 2017 20:12:21 -0800 Subject: [PATCH] Add 2.12 support --- build.sbt | 12 ++++++------ project/build.properties | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 21e4a35..f28d26b 100644 --- a/build.sbt +++ b/build.sbt @@ -4,15 +4,15 @@ name := "emoji" organization := "com.typesafe" -version := "1.0.0" +version := "1.1.0" lazy val scala210Version = "2.10.5" +lazy val scala211Version = "2.11.8" +lazy val scala212Version = "2.12.1" -lazy val scala211Version = "2.11.6" +scalaVersion := scala212Version -scalaVersion := scala210Version - -crossScalaVersions := Seq(scala210Version, scala211Version) +crossScalaVersions := Seq(scala212Version, scala211Version, scala210Version) credentials += Credentials(Path.userHome / ".ivy2" / ".credentials") @@ -32,7 +32,7 @@ javacOptions in (Compile, doc) := Seq("-target", "1.6", "-source", "1.6") licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html")) libraryDependencies ++= Seq( - "org.scalatest" %% "scalatest" % "2.2.4" % "test" + "org.scalatest" %% "scalatest" % "3.0.0" % Test ) initialCommands in console := { diff --git a/project/build.properties b/project/build.properties index 8285388..72d3ef2 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -build.version=0.13.8 \ No newline at end of file +build.version=0.13.13 \ No newline at end of file