From 6d947dcf47d027202cbfe33b410b6fa228a193eb Mon Sep 17 00:00:00 2001
From: Chris Birchall <chris.birchall@47deg.com>
Date: Mon, 7 Sep 2020 18:13:56 +0100
Subject: [PATCH] Stop cross-building reftree for scalajs (#182)

Also:
* fix the `publish` project's base directory (thanks @eatkins, see #180 for more details)
* set `crossScalaVersions` on the root project to work around an sbt bug
---
 build.sbt                   | 18 ++++++++----------
 project/ProjectPlugin.scala | 10 ++++++++++
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/build.sbt b/build.sbt
index bb8c2ec2..f8237ae9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,14 +3,15 @@ lazy val root = (project in file("."))
   .aggregate(coreJVM, coreJS)
   .aggregate(metaJVM, metaJS)
   .aggregate(macrosJVM, macrosJS)
-  .aggregate(reftreeJVM, reftreeJS)
+  .aggregate(reftree)
   .aggregate(scalacheckJVM, scalacheckJS)
   .aggregate(lawsJVM, lawsJS)
   .aggregate(testsJVM, testsJS)
   .aggregate(athemaJVM, athemaJS)
   .aggregate(readme)
+  .settings(crossScalaVersions := List()) // work around https://github.com/sbt/sbt/issues/4181
 
-lazy val publish = (project in file("."))
+lazy val publish = (project in file(".publish"))
   .settings(noPublishSettings)
   .disablePlugins(MimaPlugin)
   .aggregate(coreJVM, coreJS)
@@ -104,16 +105,14 @@ lazy val macros = module("macros")
 lazy val macrosJVM = macros.jvm
 lazy val macrosJS  = macros.js
 
-lazy val reftree = module("reftree")
-  .dependsOn(core)
+lazy val reftree = jvmModule("reftree")
+  .dependsOn(coreJVM)
   .settings(noScala213Settings)
   .settings(
     mimaPreviousArtifacts := Set(
-      organization.value                           %%% moduleName.value % V.drostePrev),
-    libraryDependencies ++= Seq("io.github.stanch" %%% "reftree"        % "1.2.1"))
-
-lazy val reftreeJVM = reftree.jvm
-lazy val reftreeJS  = reftree.js
+      organization.value                           %% moduleName.value % V.drostePrev),
+    libraryDependencies ++= Seq("io.github.stanch" %% "reftree"        % "1.2.1")
+  )
 
 lazy val scalacheck = module("scalacheck")
   .dependsOn(core)
@@ -156,7 +155,6 @@ lazy val testsJS  = tests.js
 lazy val athema = module("athema", prefix = "")
   .dependsOn(core)
   .settings(noPublishSettings)
-  .settings(noScala213Settings)
   .disablePlugins(MimaPlugin)
   .settings(
     libraryDependencies ++=
diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
index edce036a..d6261a80 100644
--- a/project/ProjectPlugin.scala
+++ b/project/ProjectPlugin.scala
@@ -29,6 +29,16 @@ object ProjectPlugin extends AutoPlugin {
         .jvmSettings(fork in Test := true)
         .settings(moduleName := s"droste-$modName")
 
+    def jvmModule(
+        modName: String,
+        prefix: String = "modules/"
+    ): Project =
+      Project(modName, file(s"$prefix$modName"))
+        .settings(
+          fork in Test := true,
+          moduleName := s"droste-$modName"
+        )
+
     lazy val macroSettings: Seq[Setting[_]] = Seq(
       libraryDependencies ++= Seq(
         scalaOrganization.value % "scala-compiler" % scalaVersion.value % Provided,