Skip to content

Commit 25d7ff4

Browse files
committed
Hard code scala binary version as a workaround for sbt bug sbt/sbt#6585
1 parent a951438 commit 25d7ff4

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

project/Build.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ object DottyJSPlugin extends AutoPlugin {
5151
_.filter(!_.name.startsWith("junit-interface"))
5252
},
5353
libraryDependencies +=
54-
("org.scala-js" % "scalajs-junit-test-runtime_2.13" % scalaJSVersion % "test"),
55-
54+
("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion % "test").cross(CrossVersion.for3Use2_13),
5655
// Typecheck the Scala.js IR found on the classpath
5756
scalaJSLinkerConfig ~= (_.withCheckIR(true)),
5857

@@ -292,6 +291,7 @@ object Build {
292291
.withAutoBoot(false) // no library on the compiler bootclasspath - we may need a more recent version
293292
.withFilterLibrary(false) // ...instead, we put it on the compiler classpath
294293
),
294+
scalaBinaryVersion := "3"
295295
)
296296

297297
lazy val commonScala2Settings = commonSettings ++ Seq(
@@ -665,7 +665,7 @@ object Build {
665665
ivyConfigurations += SourceDeps.hide,
666666
transitiveClassifiers := Seq("sources"),
667667
libraryDependencies +=
668-
("org.scala-js" % "scalajs-ir_2.13" % scalaJSVersion % "sourcedeps"),
668+
("org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps").cross(CrossVersion.for3Use2_13),
669669
(Compile / sourceGenerators) += Def.task {
670670
val s = streams.value
671671
val cacheDir = s.cacheDirectory
@@ -784,7 +784,7 @@ object Build {
784784
enablePlugins(DottyJSPlugin).
785785
settings(
786786
libraryDependencies +=
787-
("org.scala-js" % "scalajs-library_2.13" % scalaJSVersion),
787+
("org.scala-js" %% "scalajs-library" % scalaJSVersion).cross(CrossVersion.for3Use2_13),
788788
Compile / unmanagedSourceDirectories ++=
789789
(`scala3-library-bootstrapped` / Compile / unmanagedSourceDirectories).value,
790790

@@ -1101,7 +1101,7 @@ object Build {
11011101

11021102
// We need JUnit in the Compile configuration
11031103
libraryDependencies +=
1104-
("org.scala-js" % "scalajs-junit-test-runtime_2.13" % scalaJSVersion),
1104+
("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion).cross(CrossVersion.for3Use2_13),
11051105
(Compile / sourceGenerators) += Def.task {
11061106
import org.scalajs.linker.interface.CheckedBehavior
11071107

@@ -1239,7 +1239,7 @@ object Build {
12391239
settings(
12401240
Test / fork := false,
12411241
scalaJSUseMainModuleInitializer := true,
1242-
libraryDependencies += ("org.scala-js" % "scalajs-dom_sjs1_2.13" % "1.1.0")
1242+
libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13)
12431243
)
12441244

12451245
def generateDocumentation(targets: Seq[String], name: String, outDir: String, ref: String, params: Seq[String] = Nil) =

0 commit comments

Comments
 (0)