4 files changed, 19 insertions, 11 deletions
diff --git a/examples/crossBuilds/simple2/js/shared/main/scala/simple/Simple.scala b/examples/crossBuilds/simple2/js/shared/main/scala/simple/Simple.scala
index d3b0278..4ed0285 100644
--- a/examples/crossBuilds/simple2/js/shared/main/scala/simple/Simple.scala
+++ b/examples/crossBuilds/simple2/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/simple2/js/shared/test/scala/simple/SimpleTest.scala b/examples/crossBuilds/simple2/js/shared/test/scala/simple/SimpleTest.scala
index ec6b29f..b348c6f 100644
--- a/examples/crossBuilds/simple2/js/shared/test/scala/simple/SimpleTest.scala
+++ b/examples/crossBuilds/simple2/js/shared/test/scala/simple/SimpleTest.scala
@@ -5,9 +5,16 @@ import utest._
 object SimpleTest extends TestSuite{
   val tests = TestSuite{
     'format{
-      'nil - assert(Simple.formatTimes(Nil) == "")
-      'timeZero - assert(
-        Simple.formatTimes(Seq(0)) == "December 31, 1969 4:00:00 PM PST")
-     }
+      'nil - assert(Simple.formatTimes(Nil) == Nil)
+      'timeZero - {
+        val timestamps = Seq(0L, 1L << 32)
+        val expected = Seq(
+          "1970-01-01T00:00:00",
+          "1970-02-19T17:02:47"
+        )
+        val formatted = Simple.formatTimes(timestamps)
+        assert(formatted == expected)
+      }
+    }
   }
 }
 \ No newline at end of file
diff --git a/examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala b/examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala
index 2a02a5e..42cc7dc 100644
--- a/examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala
+++ b/examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala
@@ -4,6 +4,6 @@ import scala.scalajs.js
 
 object Platform{
   def format(ts: Long) = {
-    new js.Date(ts).toLocaleString()
+    new js.Date(ts).toISOString()
   }
 }
 \ No newline at end of file
diff --git a/examples/crossBuilds/simple2/jvm/src/main/scala/simple/Platform.scala b/examples/crossBuilds/simple2/jvm/src/main/scala/simple/Platform.scala
index 1b7be56..4713005 100644
--- a/examples/crossBuilds/simple2/jvm/src/main/scala/simple/Platform.scala
+++ b/examples/crossBuilds/simple2/jvm/src/main/scala/simple/Platform.scala
@@ -1,13 +1,14 @@
 //jvm/src/main/scala/simple/Platform.scala
 package simple
 import java.text.SimpleDateFormat
+import java.util.TimeZone
 
 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))
   }
 }
 \ No newline at end of file