From 92134d773c666693d4195f315f7a87ab1e2d3e07 Mon Sep 17 00:00:00 2001 From: Raul Piaggio Date: Fri, 2 Sep 2016 19:56:15 -0300 Subject: [PATCH] Fix #1: LocalTime.MIDNIGHT causes linker error. --- build.sbt | 2 +- .../scala/com/zoepepper/facades/jsjoda/LocalTime.scala | 8 ++++---- .../src/main/scala/java/time/LocalTime.scala | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index 24a8d79..e258b93 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ def BaseProject(name: String): Project = Project(name, file(name)) .settings( organization := "com.zoepepper", - version := "1.0.4", + version := "1.0.5", scalaVersion := "2.11.8", scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"), homepage := Some(url("https://github.com/zoepepper/scalajs-jsjoda")), diff --git a/facade/src/main/scala/com/zoepepper/facades/jsjoda/LocalTime.scala b/facade/src/main/scala/com/zoepepper/facades/jsjoda/LocalTime.scala index 8fc9ec9..5b3fc59 100644 --- a/facade/src/main/scala/com/zoepepper/facades/jsjoda/LocalTime.scala +++ b/facade/src/main/scala/com/zoepepper/facades/jsjoda/LocalTime.scala @@ -18,10 +18,10 @@ object LocalTime extends js.Object { def from(temporal: TemporalAccessor): LocalTime = js.native def parse(text: String, formatter: DateTimeFormatter = ???): LocalTime = js.native - val MAX: LocalDate = js.native - val MIN: LocalDate = js.native - val MIDNIGHT: LocalDate = js.native - val NOON: LocalDate = js.native + val MAX: LocalTime = js.native + val MIN: LocalTime = js.native + val MIDNIGHT: LocalTime = js.native + val NOON: LocalTime = js.native } @js.native diff --git a/java-time-drop-in/src/main/scala/java/time/LocalTime.scala b/java-time-drop-in/src/main/scala/java/time/LocalTime.scala index 29675c9..91f9767 100644 --- a/java-time-drop-in/src/main/scala/java/time/LocalTime.scala +++ b/java-time-drop-in/src/main/scala/java/time/LocalTime.scala @@ -19,10 +19,10 @@ object LocalTime { def parse(text: CharSequence): LocalTime = LocalTimeF.parse(text.toString) def parse(text: CharSequence, formatter: DateTimeFormatter): LocalTime = LocalTimeF.parse(text.toString, formatter) - val MAX: LocalDate = LocalTimeF.MAX - val MIN: LocalDate = LocalTimeF.MIN - val MIDNIGHT: LocalDate = LocalTimeF.MIDNIGHT - val NOON: LocalDate = LocalTimeF.NOON + val MAX: LocalTime = LocalTimeF.MAX + val MIN: LocalTime = LocalTimeF.MIN + val MIDNIGHT: LocalTime = LocalTimeF.MIDNIGHT + val NOON: LocalTime = LocalTimeF.NOON } class LocalTime protected[time](f: LocalTimeF) extends Wraps(f) with Comparable[LocalTime]