Permalink
Browse files

Bumped Scala to 2.12.1 and MiMa to 0.1.12.

  • Loading branch information...
1 parent 1a1b00f commit 88e8c5687040ef79d669bdb49644d927a0571bbf @milessabin committed Dec 6, 2016
Showing with 8 additions and 10 deletions.
  1. +1 −1 .travis.yml
  2. +3 −3 README.md
  3. +3 −5 build.sbt
  4. +1 −1 project/plugins.sbt
View
@@ -5,7 +5,7 @@ install:
scala:
- 2.10.6
- 2.11.8
-- 2.12.0
+- 2.12.1
jdk:
- oraclejdk8
View
@@ -117,10 +117,10 @@ resolvers ++= Seq(
Builds are available for Scala 2.10.x, 2.11.x and for 2.12.x. The main line of development for
-shapeless 2.3.2 is Scala 2.12.0. Scala 2.10.x is supported via the macro paradise compiler plugin.
+shapeless 2.3.2 is Scala 2.12.1. Scala 2.10.x is supported via the macro paradise compiler plugin.
```scala
-scalaVersion := "2.12.0"
+scalaVersion := "2.12.1"
libraryDependencies ++= Seq(
"com.chuusai" %% "shapeless" % "2.3.2"
@@ -216,7 +216,7 @@ releases][olderusage] on the shapeless wiki.
## Building shapeless
-shapeless is built with SBT 0.13.13 or later, and its master branch is built with Scala 2.12.0 by default but also
+shapeless is built with SBT 0.13.13 or later, and its master branch is built with Scala 2.12.1 by default but also
cross-builds for 2.10.6 and 2.11.8.
[namehashing]: https://github.com/sbt/sbt/issues/1640
View
@@ -4,8 +4,6 @@ import org.scalajs.sbtplugin.cross.{ CrossProject, CrossType }
import ReleaseTransformations._
import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
-import com.typesafe.tools.mima.plugin.MimaKeys
-import MimaKeys.{ previousArtifacts, binaryIssueFilters }
import com.typesafe.sbt.osgi.SbtOsgi.{ osgiSettings => defaultOsgiSettings, _ }
@@ -20,8 +18,8 @@ lazy val scoverageSettings = Seq(
lazy val buildSettings = Seq(
organization := "com.chuusai",
- scalaVersion := "2.12.0",
- crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0")
+ scalaVersion := "2.12.1",
+ crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.1")
)
addCommandAlias("root", ";project root")
@@ -234,7 +232,7 @@ lazy val noPublishSettings = Seq(
lazy val mimaSettings = mimaDefaultSettings ++ Seq(
mimaPreviousArtifacts := {
- if(scalaVersion.value == "2.12.0") Set()
+ if(scalaVersion.value == "2.12.1") Set()
else {
val previousVersion = "2.3.0"
val previousSJSVersion = "0.6.7"
View
@@ -1,7 +1,7 @@
scalacOptions += "-deprecation"
libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.15"
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.11")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.12")
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.6.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")

0 comments on commit 88e8c56

Please sign in to comment.