aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Descotte <loic.descotte@gmail.com>2017-11-11 08:04:42 +0100
committerLoic Descotte <loic.descotte@gmail.com>2017-11-11 08:24:30 +0100
commit2cd897dd1bb05981fac1fc9d61ee32f26a16c35b (patch)
treec2fb5fa0a884f501e053eb979e6dd0862f54336e
parentefe98a7d0b134415f3da0e7a7c3cb6ca5f2b44c4 (diff)
downloadmagnolia-2cd897dd1bb05981fac1fc9d61ee32f26a16c35b.tar.gz
magnolia-2cd897dd1bb05981fac1fc9d61ee32f26a16c35b.tar.bz2
magnolia-2cd897dd1bb05981fac1fc9d61ee32f26a16c35b.zip
scalajs cross build
-rw-r--r--build.sbt14
-rw-r--r--core/shared/src/main/scala/interface.scala (renamed from core/src/main/scala/interface.scala)0
-rw-r--r--core/shared/src/main/scala/magnolia.scala (renamed from core/src/main/scala/magnolia.scala)0
-rw-r--r--examples/shared/src/main/scala/decode.scala (renamed from examples/src/main/scala/decode.scala)0
-rw-r--r--examples/shared/src/main/scala/default.scala (renamed from examples/src/main/scala/default.scala)0
-rw-r--r--examples/shared/src/main/scala/eq.scala (renamed from examples/src/main/scala/eq.scala)0
-rw-r--r--examples/shared/src/main/scala/show.scala (renamed from examples/src/main/scala/show.scala)0
7 files changed, 10 insertions, 4 deletions
diff --git a/build.sbt b/build.sbt
index 27c95b6..81930f2 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,31 +1,37 @@
import com.typesafe.sbt.pgp.PgpKeys.publishSigned
-lazy val core = project
+lazy val core = crossProject
.in(file("core"))
.settings(buildSettings: _*)
.settings(publishSettings: _*)
.settings(scalaMacroDependencies: _*)
.settings(moduleName := "magnolia")
-lazy val examples = project
+lazy val coreJVM = core.jvm
+lazy val coreJS = core.js
+
+lazy val examples = crossProject
.in(file("examples"))
.settings(buildSettings: _*)
.settings(publishSettings: _*)
.settings(moduleName := "magnolia-examples")
.dependsOn(core)
+lazy val examplesJVM = examples.jvm
+lazy val examplesJS = examples.js
+
lazy val tests = project
.in(file("tests"))
.settings(buildSettings: _*)
.settings(unmanagedSettings)
.settings(moduleName := "magnolia-tests")
- .dependsOn(examples)
+ .dependsOn(examplesJVM)
lazy val benchmarks = project
.in(file("benchmarks"))
.settings(buildSettings: _*)
.settings(moduleName := "magnolia-benchmarks")
- .dependsOn(examples)
+ .dependsOn(examplesJVM)
lazy val buildSettings = Seq(
organization := "com.propensive",
diff --git a/core/src/main/scala/interface.scala b/core/shared/src/main/scala/interface.scala
index 54f8ce3..54f8ce3 100644
--- a/core/src/main/scala/interface.scala
+++ b/core/shared/src/main/scala/interface.scala
diff --git a/core/src/main/scala/magnolia.scala b/core/shared/src/main/scala/magnolia.scala
index 51f594d..51f594d 100644
--- a/core/src/main/scala/magnolia.scala
+++ b/core/shared/src/main/scala/magnolia.scala
diff --git a/examples/src/main/scala/decode.scala b/examples/shared/src/main/scala/decode.scala
index 5b083bd..5b083bd 100644
--- a/examples/src/main/scala/decode.scala
+++ b/examples/shared/src/main/scala/decode.scala
diff --git a/examples/src/main/scala/default.scala b/examples/shared/src/main/scala/default.scala
index 4c1b634..4c1b634 100644
--- a/examples/src/main/scala/default.scala
+++ b/examples/shared/src/main/scala/default.scala
diff --git a/examples/src/main/scala/eq.scala b/examples/shared/src/main/scala/eq.scala
index 8ee42a4..8ee42a4 100644
--- a/examples/src/main/scala/eq.scala
+++ b/examples/shared/src/main/scala/eq.scala
diff --git a/examples/src/main/scala/show.scala b/examples/shared/src/main/scala/show.scala
index 50b34ee..50b34ee 100644
--- a/examples/src/main/scala/show.scala
+++ b/examples/shared/src/main/scala/show.scala