diff options
author | Li Haoyi <haoyi@dropbox.com> | 2015-02-04 09:03:02 -0800 |
---|---|---|
committer | Li Haoyi <haoyi@dropbox.com> | 2015-02-04 09:03:02 -0800 |
commit | fd2f23fbfb8ce6501fff20ea1c305d00249fb465 (patch) | |
tree | 87ae6a5e66096e988dbfb0bfad0f59b32bc84ce4 /examples | |
parent | 3e92267b4f030f7bc7f0040fef50bd07e4709b21 (diff) | |
download | hands-on-scala-js-fd2f23fbfb8ce6501fff20ea1c305d00249fb465.tar.gz hands-on-scala-js-fd2f23fbfb8ce6501fff20ea1c305d00249fb465.tar.bz2 hands-on-scala-js-fd2f23fbfb8ce6501fff20ea1c305d00249fb465.zip |
Updated cross-publishing-libraries section
Diffstat (limited to 'examples')
-rw-r--r-- | examples/crossBuilds/simple/build.sbt | 9 | ||||
-rw-r--r-- | examples/crossBuilds/simple/library/js/src/main/scala/simple/Platform.scala (renamed from examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala) | 2 | ||||
-rw-r--r-- | examples/crossBuilds/simple/library/jvm/src/main/scala/simple/Platform.scala (renamed from examples/crossBuilds/simple/jvm/src/main/scala/simple/Platform.scala) | 2 | ||||
-rw-r--r-- | examples/crossBuilds/simple/library/shared/src/main/scala/simple/Simple.scala (renamed from examples/crossBuilds/simple/js/shared/main/scala/simple/Simple.scala) | 2 | ||||
-rw-r--r-- | examples/crossBuilds/simple/library/shared/src/test/scala/simple/SimpleTest.scala (renamed from examples/crossBuilds/simple/js/shared/test/scala/simple/SimpleTest.scala) | 7 |
5 files changed, 13 insertions, 9 deletions
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/src/main/scala/simple/Platform.scala b/examples/crossBuilds/simple/library/js/src/main/scala/simple/Platform.scala index d4a9554..0191915 100644 --- a/examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala +++ b/examples/crossBuilds/simple/library/js/src/main/scala/simple/Platform.scala @@ -1,4 +1,4 @@ -//js/src/main/scala/simple/Platform.scala +// library/js/src/main/scala/simple/Platform.scala package simple import scalajs.js diff --git a/examples/crossBuilds/simple/jvm/src/main/scala/simple/Platform.scala b/examples/crossBuilds/simple/library/jvm/src/main/scala/simple/Platform.scala index 4713005..473e233 100644 --- a/examples/crossBuilds/simple/jvm/src/main/scala/simple/Platform.scala +++ b/examples/crossBuilds/simple/library/jvm/src/main/scala/simple/Platform.scala @@ -1,4 +1,4 @@ -//jvm/src/main/scala/simple/Platform.scala +// library/jvm/src/main/scala/simple/Platform.scala package simple import java.text.SimpleDateFormat import java.util.TimeZone diff --git a/examples/crossBuilds/simple/js/shared/main/scala/simple/Simple.scala b/examples/crossBuilds/simple/library/shared/src/main/scala/simple/Simple.scala index 4ed0285..4802535 100644 --- a/examples/crossBuilds/simple/js/shared/main/scala/simple/Simple.scala +++ b/examples/crossBuilds/simple/library/shared/src/main/scala/simple/Simple.scala @@ -1,4 +1,4 @@ -/*shared/main/scala/simple/Simple.scala*/ +// library/shared/src/main/scala/simple/Simple.scala package simple object Simple{ def formatTimes(timestamps: Seq[Long]): Seq[String] = { diff --git a/examples/crossBuilds/simple/js/shared/test/scala/simple/SimpleTest.scala b/examples/crossBuilds/simple/library/shared/src/test/scala/simple/SimpleTest.scala index b348c6f..5c67baf 100644 --- a/examples/crossBuilds/simple/js/shared/test/scala/simple/SimpleTest.scala +++ b/examples/crossBuilds/simple/library/shared/src/test/scala/simple/SimpleTest.scala @@ -1,5 +1,5 @@ -/*js/shared/test/scala/simple/SimpleTest.scala*/ -/*jvm/shared/test/scala/simple/SimpleTest.scala*/ +// library/shared/src/test/scala/simple/SimpleTest.scala + package simple import utest._ object SimpleTest extends TestSuite{ @@ -16,5 +16,8 @@ object SimpleTest extends TestSuite{ assert(formatted == expected) } } + 'zero{ + 0.0 + } } }
\ No newline at end of file |