diff options
Diffstat (limited to 'examples/crossBuilds/simple')
3 files changed, 12 insertions, 11 deletions
diff --git a/examples/crossBuilds/simple/js/shared/main/scala/simple/Simple.scala b/examples/crossBuilds/simple/js/shared/main/scala/simple/Simple.scala index d3b0278..4ed0285 100644 --- a/examples/crossBuilds/simple/js/shared/main/scala/simple/Simple.scala +++ b/examples/crossBuilds/simple/js/shared/main/scala/simple/Simple.scala @@ -1,7 +1,7 @@ /*shared/main/scala/simple/Simple.scala*/ package simple object Simple{ - def formatTimes(timestamps: Seq[Long]): String = { - timestamps.map(Platform.format).mkString("\n") + def formatTimes(timestamps: Seq[Long]): Seq[String] = { + timestamps.map(Platform.format).map(_.dropRight(5)) } }
\ No newline at end of file diff --git a/examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala b/examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala index ee2f5da..35ebe1d 100644 --- a/examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala +++ b/examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala @@ -4,12 +4,12 @@ import scala.scalajs.js object Platform extends js.JSApp{ def format(ts: Long) = { - new js.Date(ts).toLocaleString() + new js.Date(ts).toISOString() } def main() = { val times = Seq( - System.currentTimeMillis(), - System.currentTimeMillis() + 1000 + 0L, + 1L << 32 ) println("Running on JS! " + 1.0d) println(Simple.formatTimes(times)) diff --git a/examples/crossBuilds/simple/jvm/src/main/scala/simple/Platform.scala b/examples/crossBuilds/simple/jvm/src/main/scala/simple/Platform.scala index e8e7a65..c5e8216 100644 --- a/examples/crossBuilds/simple/jvm/src/main/scala/simple/Platform.scala +++ b/examples/crossBuilds/simple/jvm/src/main/scala/simple/Platform.scala @@ -1,19 +1,20 @@ //jvm/src/main/scala/simple/Platform.scala package simple import java.text.SimpleDateFormat +import java.util.{TimeZone, Locale} object Platform{ def format(ts: Long) = { - val fmt = - "MMMM d, yyyy h:mm:ss aaa z" - new SimpleDateFormat(fmt).format( - new java.util.Date(ts) + val fmt = new SimpleDateFormat( + "yyyy-MM-dd'T'HH:mm:ss.sss'Z'" ) + fmt.setTimeZone(TimeZone.getTimeZone("UTC")) + fmt.format(new java.util.Date(ts)) } def main(args: Array[String]) = { val times = Seq( - System.currentTimeMillis(), - System.currentTimeMillis() + 1000 + 0L, + 1L << 32 ) println("Running on JVM! " + 1.0d) println(Simple.formatTimes(times)) |