Giving it a try..

lloydmeta · Apr 4, 2015 · 2e94a5c · 2e94a5c
1 parent d7c5bbb
commit 2e94a5c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/...core/src/main/scala/enumeratum/Enum.scala → ...ared/src/main/scala/enumeratum/Enum.scala b/...core/src/main/scala/enumeratum/Enum.scala → ...ared/src/main/scala/enumeratum/Enum.scala
diff --git a/.../src/test/scala/enumeratum/EnumSpec.scala → .../src/test/scala/enumeratum/EnumSpec.scala b/.../src/test/scala/enumeratum/EnumSpec.scala → .../src/test/scala/enumeratum/EnumSpec.scala
diff --git a/...re/src/test/scala/enumeratum/Models.scala → ...ed/src/test/scala/enumeratum/Models.scala b/...re/src/test/scala/enumeratum/Models.scala → ...ed/src/test/scala/enumeratum/Models.scala
diff --git a/...rc/main/scala/enumeratum/EnumMacros.scala → ...rc/main/scala/enumeratum/EnumMacros.scala b/...rc/main/scala/enumeratum/EnumMacros.scala → ...rc/main/scala/enumeratum/EnumMacros.scala
diff --git a/project/Build.scala b/project/Build.scala
@@ -8,6 +8,7 @@ import com.typesafe.sbt.SbtSite.site
 import sbtunidoc.Plugin.UnidocKeys._
 import sbtunidoc.Plugin._
 import com.typesafe.sbt.SbtGit.{GitKeys => git}
+import org.scalajs.sbtplugin.cross.CrossProject._
 
 object Enumeratum extends Build {
 
@@ -35,9 +36,10 @@ object Enumeratum extends Build {
       publishArtifact := false,
       publishLocal := {}
     )
-    .aggregate(macros, core, enumeratumPlay, enumeratumPlayJson)
+    .aggregate(macrosJs, macrosJvm, coreJs, coreJvm, enumeratumPlay, enumeratumPlayJson)
 
-  lazy val core = Project(id = "enumeratum", base = file("enumeratum-core"), settings = commonWithPublishSettings)
+  lazy val core = crossProject.in(file("enumeratum-core"))
+    .settings(commonWithPublishSettings:_*)
     .settings(
       name := "enumeratum",
       crossScalaVersions := scalaVersions,
@@ -47,7 +49,11 @@ object Enumeratum extends Build {
       )
     ).dependsOn(macros)
 
-  lazy val macros = Project(id = "enumeratum-macros", base = file("macros"), settings = commonWithPublishSettings)
+  lazy val coreJs = core.js
+  lazy val coreJvm = core.jvm
+
+  lazy val macros = crossProject.in(file("macros"))
+    .settings(commonWithPublishSettings:_*)
     .settings(
       name := "enumeratum-macros",
       crossScalaVersions := scalaVersions,
@@ -69,6 +75,9 @@ object Enumeratum extends Build {
         additionalMacroDeps }
     )
 
+  lazy val macrosJs = macros.js
+  lazy val macrosJvm = macros.jvm
+
   lazy val enumeratumPlayJson = Project(id = "enumeratum-play-json", base = file("enumeratum-play-json"), settings = commonWithPublishSettings)
     .settings(
       crossScalaVersions := scalaVersions,
@@ -77,7 +86,7 @@ object Enumeratum extends Build {
         "com.typesafe.play" %% "play-json" % "2.3.8" % "provided",
         "org.scalatest" %% "scalatest" % "2.2.1" % "test"
       )
-    ).dependsOn(core)
+    ).dependsOn(coreJvm)
 
   lazy val enumeratumPlay = Project(id = "enumeratum-play", base = file("enumeratum-play"), settings = commonWithPublishSettings)
     .settings(
@@ -87,7 +96,7 @@ object Enumeratum extends Build {
         "com.typesafe.play" %% "play" % "2.3.8" % "provided",
         "org.scalatest" %% "scalatest" % "2.2.1" % "test"
       )
-    ).dependsOn(core, enumeratumPlayJson)
+    ).dependsOn(coreJvm, enumeratumPlayJson)
 
 
   lazy val commonSettings = Seq(

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -19,4 +19,6 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.1")
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1")
 
 // Provides auto-generating and publishing a gh-pages site
-addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3")
+addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3")
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.2")