From fd2f23fbfb8ce6501fff20ea1c305d00249fb465 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi@dropbox.com>
Date: Wed, 4 Feb 2015 09:03:02 -0800
Subject: Updated cross-publishing-libraries section

---
 examples/crossBuilds/simple/build.sbt              |  9 +++++----
 .../js/shared/main/scala/simple/Simple.scala       |  7 -------
 .../js/shared/test/scala/simple/SimpleTest.scala   | 20 -------------------
 .../simple/js/src/main/scala/simple/Platform.scala |  9 ---------
 .../jvm/src/main/scala/simple/Platform.scala       | 14 -------------
 .../js/src/main/scala/simple/Platform.scala        |  9 +++++++++
 .../jvm/src/main/scala/simple/Platform.scala       | 14 +++++++++++++
 .../shared/src/main/scala/simple/Simple.scala      |  7 +++++++
 .../shared/src/test/scala/simple/SimpleTest.scala  | 23 ++++++++++++++++++++++
 9 files changed, 58 insertions(+), 54 deletions(-)
 delete mode 100644 examples/crossBuilds/simple/js/shared/main/scala/simple/Simple.scala
 delete mode 100644 examples/crossBuilds/simple/js/shared/test/scala/simple/SimpleTest.scala
 delete mode 100644 examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala
 delete mode 100644 examples/crossBuilds/simple/jvm/src/main/scala/simple/Platform.scala
 create mode 100644 examples/crossBuilds/simple/library/js/src/main/scala/simple/Platform.scala
 create mode 100644 examples/crossBuilds/simple/library/jvm/src/main/scala/simple/Platform.scala
 create mode 100644 examples/crossBuilds/simple/library/shared/src/main/scala/simple/Simple.scala
 create mode 100644 examples/crossBuilds/simple/library/shared/src/test/scala/simple/SimpleTest.scala

(limited to 'examples')

diff --git a/examples/crossBuilds/simple/build.sbt b/examples/crossBuilds/simple/build.sbt
index eb22c41..609989e 100644
--- a/examples/crossBuilds/simple/build.sbt
+++ b/examples/crossBuilds/simple/build.sbt
@@ -1,12 +1,13 @@
 
-val cross = crossProject.settings(
-  // Shared settings here
+val library = crossProject.settings(
+  libraryDependencies += "com.lihaoyi" %%% "utest" % "0.3.0",
+  testFrameworks += new TestFramework("utest.runner.Framework")
 ).jsSettings(
   // JS-specific settings here
 ).jvmSettings(
   // JVM-specific settings here
 )
 
-lazy val js = cross.js
+lazy val js = library.js
 
-lazy val jvm = cross.jvm
+lazy val jvm = library.jvm
diff --git a/examples/crossBuilds/simple/js/shared/main/scala/simple/Simple.scala b/examples/crossBuilds/simple/js/shared/main/scala/simple/Simple.scala
deleted file mode 100644
index 4ed0285..0000000
--- a/examples/crossBuilds/simple/js/shared/main/scala/simple/Simple.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-/*shared/main/scala/simple/Simple.scala*/
-package simple
-object Simple{
-  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/shared/test/scala/simple/SimpleTest.scala b/examples/crossBuilds/simple/js/shared/test/scala/simple/SimpleTest.scala
deleted file mode 100644
index b348c6f..0000000
--- a/examples/crossBuilds/simple/js/shared/test/scala/simple/SimpleTest.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-/*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
deleted file mode 100644
index d4a9554..0000000
--- a/examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-//js/src/main/scala/simple/Platform.scala
-package simple
-import scalajs.js
-
-object Platform{
-  def format(ts: Long) = {
-    new js.Date(ts).toISOString()
-  }
-}
\ 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
deleted file mode 100644
index 4713005..0000000
--- a/examples/crossBuilds/simple/jvm/src/main/scala/simple/Platform.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-//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 = 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
diff --git a/examples/crossBuilds/simple/library/js/src/main/scala/simple/Platform.scala b/examples/crossBuilds/simple/library/js/src/main/scala/simple/Platform.scala
new file mode 100644
index 0000000..0191915
--- /dev/null
+++ b/examples/crossBuilds/simple/library/js/src/main/scala/simple/Platform.scala
@@ -0,0 +1,9 @@
+// library/js/src/main/scala/simple/Platform.scala
+package simple
+import scalajs.js
+
+object Platform{
+  def format(ts: Long) = {
+    new js.Date(ts).toISOString()
+  }
+}
\ No newline at end of file
diff --git a/examples/crossBuilds/simple/library/jvm/src/main/scala/simple/Platform.scala b/examples/crossBuilds/simple/library/jvm/src/main/scala/simple/Platform.scala
new file mode 100644
index 0000000..473e233
--- /dev/null
+++ b/examples/crossBuilds/simple/library/jvm/src/main/scala/simple/Platform.scala
@@ -0,0 +1,14 @@
+// library/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 = 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
diff --git a/examples/crossBuilds/simple/library/shared/src/main/scala/simple/Simple.scala b/examples/crossBuilds/simple/library/shared/src/main/scala/simple/Simple.scala
new file mode 100644
index 0000000..4802535
--- /dev/null
+++ b/examples/crossBuilds/simple/library/shared/src/main/scala/simple/Simple.scala
@@ -0,0 +1,7 @@
+// library/shared/src/main/scala/simple/Simple.scala
+package simple
+object Simple{
+  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/library/shared/src/test/scala/simple/SimpleTest.scala b/examples/crossBuilds/simple/library/shared/src/test/scala/simple/SimpleTest.scala
new file mode 100644
index 0000000..5c67baf
--- /dev/null
+++ b/examples/crossBuilds/simple/library/shared/src/test/scala/simple/SimpleTest.scala
@@ -0,0 +1,23 @@
+// library/shared/src/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)
+      }
+    }
+    'zero{
+      0.0
+    }
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3