Fix #1: LocalTime.MIDNIGHT causes linker error.

zoepepper · Sep 2, 2016 · 92134d7 · 92134d7
1 parent 9f1713e
commit 92134d7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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]