Skip to content

Commit

Permalink
Merge pull request #93 from cquiroz/release2
Browse files Browse the repository at this point in the history
Last minute fixes
  • Loading branch information
cquiroz authored Dec 5, 2018
2 parents fddfc72 + 943977a commit c21ca47
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion core/js/src/main/scala/java/util/TimeZone.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")

Expand Down

0 comments on commit c21ca47

Please sign in to comment.