Skip to content

Commit 58d71f9

Browse files
committed
Merge remote-tracking branch 'origin/main' into community-build-2.13
2 parents 73a521e + cb0584b commit 58d71f9

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

build.sbt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,18 @@ lazy val commonSettings = crossVersionSharedSources ++ Seq(
9191
)
9292
)
9393

94+
lazy val jsSourceMapSettings = Def.settings(
95+
scalacOptions += {
96+
val tagOrHash =
97+
if (!isSnapshot.value) s"v${version.value}"
98+
else git.gitHeadCommit.value.getOrElse("main")
99+
val local = (LocalRootProject / baseDirectory).value.toURI.toString
100+
val remote = s"https://raw.githubusercontent.com/milessabin/shapeless/$tagOrHash/"
101+
val opt = "-P:scalajs:mapSourceURI"
102+
s"$opt:$local->$remote"
103+
}
104+
)
105+
94106
def configureJUnit(crossProject: CrossProject) = crossProject
95107
.jvmSettings(libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % "test")
96108
.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
@@ -147,7 +159,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
147159
.settings(macroAnnotationSettings)
148160

149161
lazy val coreJVM = core.jvm
150-
lazy val coreJS = core.js
162+
lazy val coreJS = core.js.settings(jsSourceMapSettings)
151163
lazy val coreNative = core.native
152164

153165
lazy val scratch = crossProject(JSPlatform, JVMPlatform, NativePlatform)

project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
scalacOptions += "-deprecation"
2-
libraryDependencies += "org.slf4j" % "slf4j-nop" % "2.0.16"
2+
libraryDependencies += "org.slf4j" % "slf4j-nop" % "2.0.17"
33

44
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
55
addSbtPlugin("com.github.sbt" % "sbt-osgi" % "0.10.0")
66
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
7-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")
7+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
88
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
9-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
10-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5")
9+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
10+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6")
1111
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
1212
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
1313
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0")

0 commit comments

Comments
 (0)