Merge pull request #1 from ttim/scala_2.12

Support Scala 2.12
non · May 23, 2017 · ca9d5b3 · ca9d5b3
2 parents 93597f8 + 156092e
commit ca9d5b3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ TAGS
 *~
 .#*
 .lib
+/.idea
diff --git a/build.sbt b/build.sbt
@@ -4,13 +4,13 @@ lazy val chainSettings = Seq(
   organization := "org.spire-math",
   licenses += ("MIT", url("http://opensource.org/licenses/MIT")),
   homepage := Some(url("http://github.com/non/chain")),
-  scalaVersion := "2.11.8",
-  crossScalaVersions := Seq("2.10.6", "2.11.8"),
+  scalaVersion := "2.11.11",
+  crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.2"),
   scalacOptions ++= Seq(
     "-feature",
     "-deprecation",
     "-unchecked"),
-  libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.13.0" % "test",
+  libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.13.5" % "test",
   scalaJSStage in Global := FastOptStage,
   releaseCrossBuild := true,
   releasePublishArtifactsAction := PgpKeys.publishSigned.value,

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=0.13.13
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
 addSbtPlugin("com.jsuereth"      % "sbt-pgp"      % "1.0.0")
 addSbtPlugin("com.github.gseitz" % "sbt-release"  % "1.0.0")
 addSbtPlugin("org.xerial.sbt"    % "sbt-sonatype" % "1.1")
-addSbtPlugin("org.scala-js"      % "sbt-scalajs"  % "0.6.8")
+addSbtPlugin("org.scala-js"      % "sbt-scalajs"  % "0.6.16")