Skip to content

Commit

Permalink
Add 2.12 support
Browse files Browse the repository at this point in the history
  • Loading branch information
wsargent committed Mar 9, 2017
1 parent ba2d0b4 commit 07ccb1b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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 := {
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
build.version=0.13.8
build.version=0.13.13

0 comments on commit 07ccb1b

Please sign in to comment.