summaryrefslogtreecommitdiff
path: root/examples/crossBuilds/simple2
diff options
context:
space:
mode:
authorLi Haoyi <haoyi@dropbox.com>2015-02-04 06:28:31 -0800
committerLi Haoyi <haoyi@dropbox.com>2015-02-04 06:28:31 -0800
commit3e92267b4f030f7bc7f0040fef50bd07e4709b21 (patch)
treee10900fcd96d9b6c8cc53e5b641bdd11ebfe59b8 /examples/crossBuilds/simple2
parentb094df4a6a6cf1bf7eeb36d842970aa8b3d94d5f (diff)
downloadhands-on-scala-js-3e92267b4f030f7bc7f0040fef50bd07e4709b21.tar.gz
hands-on-scala-js-3e92267b4f030f7bc7f0040fef50bd07e4709b21.tar.bz2
hands-on-scala-js-3e92267b4f030f7bc7f0040fef50bd07e4709b21.zip
clientserver examples now work with crossProject
Diffstat (limited to 'examples/crossBuilds/simple2')
-rw-r--r--examples/crossBuilds/simple2/build.sbt12
-rw-r--r--examples/crossBuilds/simple2/js/shared/main/scala/simple/Simple.scala7
-rw-r--r--examples/crossBuilds/simple2/js/shared/test/scala/simple/SimpleTest.scala20
-rw-r--r--examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala9
l---------examples/crossBuilds/simple2/jvm/shared1
-rw-r--r--examples/crossBuilds/simple2/jvm/src/main/scala/simple/Platform.scala14
-rw-r--r--examples/crossBuilds/simple2/project/build.properties1
-rw-r--r--examples/crossBuilds/simple2/project/build.sbt4
8 files changed, 0 insertions, 68 deletions
diff --git a/examples/crossBuilds/simple2/build.sbt b/examples/crossBuilds/simple2/build.sbt
deleted file mode 100644
index eb22c41..0000000
--- a/examples/crossBuilds/simple2/build.sbt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-val cross = crossProject.settings(
- // Shared settings here
-).jsSettings(
- // JS-specific settings here
-).jvmSettings(
- // JVM-specific settings here
-)
-
-lazy val js = cross.js
-
-lazy val jvm = cross.jvm
diff --git a/examples/crossBuilds/simple2/js/shared/main/scala/simple/Simple.scala b/examples/crossBuilds/simple2/js/shared/main/scala/simple/Simple.scala
deleted file mode 100644
index 4ed0285..0000000
--- a/examples/crossBuilds/simple2/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/simple2/js/shared/test/scala/simple/SimpleTest.scala b/examples/crossBuilds/simple2/js/shared/test/scala/simple/SimpleTest.scala
deleted file mode 100644
index b348c6f..0000000
--- a/examples/crossBuilds/simple2/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/simple2/js/src/main/scala/simple/Platform.scala b/examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala
deleted file mode 100644
index d4a9554..0000000
--- a/examples/crossBuilds/simple2/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/simple2/jvm/shared b/examples/crossBuilds/simple2/jvm/shared
deleted file mode 120000
index a12df7d..0000000
--- a/examples/crossBuilds/simple2/jvm/shared
+++ /dev/null
@@ -1 +0,0 @@
-../js/shared \ 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
deleted file mode 100644
index 4713005..0000000
--- a/examples/crossBuilds/simple2/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/simple2/project/build.properties b/examples/crossBuilds/simple2/project/build.properties
deleted file mode 100644
index 748703f..0000000
--- a/examples/crossBuilds/simple2/project/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-sbt.version=0.13.7
diff --git a/examples/crossBuilds/simple2/project/build.sbt b/examples/crossBuilds/simple2/project/build.sbt
deleted file mode 100644
index a1be3f8..0000000
--- a/examples/crossBuilds/simple2/project/build.sbt
+++ /dev/null
@@ -1,4 +0,0 @@
-/*project/build.sbt*/
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0-RC2")
-
-addSbtPlugin("com.lihaoyi" % "utest-js-plugin" % "0.2.5-RC1")