5 files changed, 32 insertions, 25 deletions
diff --git a/examples/crossBuilds/simple/build.sbt b/examples/crossBuilds/simple/build.sbt
index ce296c4..eb22c41 100644
--- a/examples/crossBuilds/simple/build.sbt
+++ b/examples/crossBuilds/simple/build.sbt
@@ -1,9 +1,12 @@
-val sharedSettings = Seq(
-  unmanagedSourceDirectories in Compile +=
-    baseDirectory.value  / "shared" / "main" / "scala"
+
+val cross = crossProject.settings(
+  // Shared settings here
+).jsSettings(
+  // JS-specific settings here
+).jvmSettings(
+  // JVM-specific settings here
 )
 
-lazy val js = project.in(file("js")).enablePlugins(ScalaJSPlugin)
-                                    .settings(sharedSettings:_*)
+lazy val js = cross.js
 
-lazy val jvm = project.in(file("jvm")).settings(sharedSettings:_*)
-\ No newline at end of file
+lazy val jvm = cross.jvm
diff --git a/examples/crossBuilds/simple/js/shared/test/scala/simple/SimpleTest.scala b/examples/crossBuilds/simple/js/shared/test/scala/simple/SimpleTest.scala
new file mode 100644
index 0000000..b348c6f
--- /dev/null
+++ b/examples/crossBuilds/simple/js/shared/test/scala/simple/SimpleTest.scala
@@ -0,0 +1,20 @@
+/*js/shared/test/scala/simple/SimpleTest.scala*/
+/*jvm/shared/test/scala/simple/SimpleTest.scala*/
+package simple
+import utest._
+object SimpleTest extends TestSuite{
+  val tests = TestSuite{
+    'format{
+      '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/simple/js/src/main/scala/simple/Platform.scala b/examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala
index d726ec1..d4a9554 100644
--- a/examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala
+++ b/examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala
@@ -2,16 +2,8 @@
 package simple
 import scalajs.js
 
-object Platform extends js.JSApp{
+object Platform{
   def format(ts: Long) = {
     new js.Date(ts).toISOString()
   }
-  def main() = {
-    val times = Seq(
-      0L,
-      1L << 32
-    )
-    println("Running on JS! " + 1.0d)
-    println(Simple.formatTimes(times))
-  }
 }
 \ No newline at end of file
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 c5e8216..4713005 100644
--- a/examples/crossBuilds/simple/jvm/src/main/scala/simple/Platform.scala
+++ b/examples/crossBuilds/simple/jvm/src/main/scala/simple/Platform.scala
@@ -1,7 +1,7 @@
 //jvm/src/main/scala/simple/Platform.scala
 package simple
 import java.text.SimpleDateFormat
-import java.util.{TimeZone, Locale}
+import java.util.TimeZone
 
 object Platform{
   def format(ts: Long) = {
@@ -11,12 +11,4 @@ object Platform{
     fmt.setTimeZone(TimeZone.getTimeZone("UTC"))
     fmt.format(new java.util.Date(ts))
   }
-  def main(args: Array[String]) = {
-    val times = Seq(
-      0L,
-      1L << 32
-    )
-    println("Running on JVM! " + 1.0d)
-    println(Simple.formatTimes(times))
-  }
 }
 \ No newline at end of file
diff --git a/examples/crossBuilds/simple/project/build.sbt b/examples/crossBuilds/simple/project/build.sbt
index b42401a..3175002 100644
--- a/examples/crossBuilds/simple/project/build.sbt
+++ b/examples/crossBuilds/simple/project/build.sbt
@@ -1,2 +1,2 @@
 /*project/build.sbt*/
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0-RC2")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0")