diff --git a/build.sbt b/build.sbt index 73326ad2f..d4fe7db5a 100644 --- a/build.sbt +++ b/build.sbt @@ -21,9 +21,9 @@ lazy val commonSettings = Seq( scalaVersion := scalaVer, crossScalaVersions := { if (scalaJSVersion.startsWith("0.6")) { - Seq("2.10.7", "2.11.12", "2.12.7", "2.13.0-M5") + Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0-M5") } else { - Seq("2.11.12", "2.12.7", "2.13.0-M5") + Seq("2.11.12", "2.12.8", "2.13.0-M5") } }, scalacOptions ++= Seq( diff --git a/core/js/src/main/scala/java/util/TimeZone.scala b/core/js/src/main/scala/java/util/TimeZone.scala index 0d2287f4c..051a2b05b 100644 --- a/core/js/src/main/scala/java/util/TimeZone.scala +++ b/core/js/src/main/scala/java/util/TimeZone.scala @@ -29,7 +29,7 @@ object TimeZone { // This is supported since EcmaScript 1 def offsetInMillis: Int = { val browserDate = new scalajs.js.Date() - browserDate.getTimezoneOffset() * 60 * 1000 + browserDate.getTimezoneOffset().toInt * 60 * 1000 } def timeZone: String = { diff --git a/project/plugins.sbt b/project/plugins.sbt index 7f0562ca9..b0f9da9c0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.15") +addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.27") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")