Merge branch '1.1.x' into wip/merge-1.1.x

This commit is contained in:
Eugene Yokota
2018-05-04 12:40:43 -04:00
6 changed files with 52 additions and 15 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies {
// WARNING: Please Scala update versions in PluginCross.scala too
val scala212 = "2.12.5"
val scala212 = "2.12.6"
val baseScalaVersion = scala212
// sbt modules
+1 -1
View File
@@ -1,4 +1,4 @@
scalaVersion := "2.12.4"
scalaVersion := "2.12.6"
scalacOptions ++= Seq("-feature", "-language:postfixOps")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.2.0")