Merge pull request #93 from cquiroz/release2

cquiroz · web-flow · commit c21ca4746264 · 2018-12-05T17:12:42.000-03:00
Last minute fixes
diff --git 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
@@ -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
@@ -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")
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ object TimeZone {`
`29`	`29`	`// This is supported since EcmaScript 1`
`30`	`30`	`def offsetInMillis: Int = {`
`31`	`31`	`val browserDate = new scalajs.js.Date()`
`32`		`- browserDate.getTimezoneOffset() * 60 * 1000`
	`32`	`+ browserDate.getTimezoneOffset().toInt * 60 * 1000`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`def timeZone: String = {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.15")`
	`2`	`+addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.27")`
`3`	`3`
`4`	`4`	`addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")`
`5`	`5`