Another attempt at fixing #684

sirthias · Jan 5, 2024 · 0efa448 · 0efa448
1 parent 12d4fb2
commit 0efa448
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/build.sbt b/build.sbt
@@ -54,7 +54,14 @@ lazy val commonSettings = Seq(
     // "-Ydebug-error",
     "-Xmax-inlines:128", // required for compiling upickle benchmarks
     // "-Wunused:all" // disabled until https://github.com/lampepfl/dotty/issues/17315 is resolved
-  ),
+  ) ++ {
+    val dir = baseDirectory.value
+    if (dir.name == ".js") {
+      val localSourcesPath = baseDirectory.value.toURI
+      val remoteSourcesPath = s"https://raw.githubusercontent.com/sirthias/borer/${git.gitHeadCommit.value.get}/"
+      s"-scalajs-mapSourceURI:${dir.getParentFile.toURI}->$remoteSourcesPath" :: Nil
+    } else Nil
+  },
   Compile / console / scalacOptions ~= (_ filterNot (o => o.contains("warn") || o.contains("Xlint"))),
   Test / console / scalacOptions := (Compile / console / scalacOptions).value,
   Compile / doc / scalacOptions += "-no-link-warnings",

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.9.8
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,17 +1,16 @@
-addSbtPlugin("org.scalameta"                      % "sbt-scalafmt"               % "2.5.2")
-addSbtPlugin("io.crashbox"                        % "sbt-gpg"                    % "0.2.1")
-addSbtPlugin("com.github.sbt"                     % "sbt-release"                % "1.1.0")
-addSbtPlugin("org.xerial.sbt"                     % "sbt-sonatype"               % "3.10.0")
-addSbtPlugin("de.heikoseeberger"                  % "sbt-header"                 % "5.10.0")
-addSbtPlugin("io.spray"                           % "sbt-boilerplate"            % "0.6.1")
-addSbtPlugin("org.scala-js"                       % "sbt-scalajs"                % "1.14.0")
-addSbtPlugin("org.portable-scala"                 % "sbt-scalajs-crossproject"   % "1.3.2")
-addSbtPlugin("pl.project13.scala"                 % "sbt-jmh"                    % "0.4.6")
-addSbtPlugin("com.lightbend.paradox"              % "sbt-paradox"                % "0.10.5")
-addSbtPlugin("io.bullet"                          % "sbt-paradox-material-theme" % "0.7.0")
-addSbtPlugin("com.github.sbt"                     % "sbt-ghpages"                % "0.7.0")
-addSbtPlugin("com.typesafe.sbt"                   % "sbt-site"                   % "1.4.1")
-addSbtPlugin("com.thoughtworks.sbt-scala-js-map"  % "sbt-scala-js-map"           % "4.1.1")
+addSbtPlugin("org.scalameta"          % "sbt-scalafmt"               % "2.5.2")
+addSbtPlugin("io.crashbox"            % "sbt-gpg"                    % "0.2.1")
+addSbtPlugin("com.github.sbt"         % "sbt-release"                % "1.1.0")
+addSbtPlugin("org.xerial.sbt"         % "sbt-sonatype"               % "3.10.0")
+addSbtPlugin("de.heikoseeberger"      % "sbt-header"                 % "5.10.0")
+addSbtPlugin("io.spray"               % "sbt-boilerplate"            % "0.6.1")
+addSbtPlugin("org.scala-js"           % "sbt-scalajs"                % "1.14.0")
+addSbtPlugin("org.portable-scala"     % "sbt-scalajs-crossproject"   % "1.3.2")
+addSbtPlugin("pl.project13.scala"     % "sbt-jmh"                    % "0.4.6")
+addSbtPlugin("com.lightbend.paradox"  % "sbt-paradox"                % "0.10.5")
+addSbtPlugin("io.bullet"              % "sbt-paradox-material-theme" % "0.7.0")
+addSbtPlugin("com.github.sbt"         % "sbt-ghpages"                % "0.7.0")
+addSbtPlugin("com.typesafe.sbt"       % "sbt-site"                   % "1.4.1")
 
 libraryDependencies ++= Seq(
   "io.bullet" %% "borer-core"       % "1.7.2",