Merge branch 'master' of https://github.com/cfpb/hmda-platform

Kibrael · Kibrael · commit 5a3292c0d078 · 2017-08-03T10:00:48.000-06:00
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -5,7 +5,7 @@ import sbtassembly.AssemblyPlugin.autoImport._
 object BuildSettings {
   val buildOrganization = "cfpb"
   val buildVersion      = "1.0.0"
-  val buildScalaVersion = "2.12.1"
+  val buildScalaVersion = "2.12.3"
 
   val hmdaBuildSettings = Defaults.coreDefaultSettings ++
     Seq(
diff --git a/project/scalajs.sbt b/project/scalajs.sbt
@@ -5,4 +5,4 @@ addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.8")
 
 libraryDependencies += "com.trueaccord.scalapb" %% "compilerplugin" % "0.5.47"
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.16")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,4 @@ addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.8")`
`5`	`5`
`6`	`6`	`libraryDependencies += "com.trueaccord.scalapb" %% "compilerplugin" % "0.5.47"`
`7`	`7`
`8`		`-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.16")`
	`8`	`+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")`