@@ -12,6 +12,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
12
12
import sbt .Package .ManifestAttributes
13
13
14
14
import com .typesafe .sbteclipse .plugin .EclipsePlugin ._
15
+ import dotty .tools .sbtplugin .DottyPlugin .autoImport ._
15
16
16
17
/* In sbt 0.13 the Build trait would expose all vals to the shell, where you
17
18
* can use them in "set a := b" like expressions. This re-exposes them.
@@ -129,8 +130,6 @@ object Build {
129
130
EclipseKeys .skipProject := true ,
130
131
version := dottyVersion,
131
132
scalaVersion := dottyNonBootstrappedVersion,
132
- scalaOrganization := dottyOrganization,
133
- scalaBinaryVersion := " 0.1" ,
134
133
135
134
// Avoid having to run `dotty-sbt-bridge/publishLocal` before compiling a bootstrapped project
136
135
scalaCompilerBridgeSource :=
@@ -171,9 +170,9 @@ object Build {
171
170
libraryDependencies ++= {
172
171
if (bootstrapFromPublishedJars.value)
173
172
Seq (
174
- dottyOrganization % " dotty-library_2.11 " % dottyNonBootstrappedVersion % Configurations .ScalaTool .name,
175
- dottyOrganization % " dotty-compiler_2.11 " % dottyNonBootstrappedVersion % Configurations .ScalaTool .name
176
- )
173
+ dottyOrganization %% " dotty-library " % dottyNonBootstrappedVersion % Configurations .ScalaTool .name,
174
+ dottyOrganization %% " dotty-compiler " % dottyNonBootstrappedVersion % Configurations .ScalaTool .name
175
+ ).map(_.withDottyCompat())
177
176
else
178
177
Seq ()
179
178
},
@@ -426,7 +425,7 @@ object Build {
426
425
427
426
// get libraries onboard
428
427
libraryDependencies ++= Seq (" com.typesafe.sbt" % " sbt-interface" % sbtVersion.value,
429
- " org.scala-lang.modules" % " scala-xml_2.11 " % " 1.0.1" ,
428
+ ( " org.scala-lang.modules" %% " scala-xml " % " 1.0.1" ).withDottyCompat() ,
430
429
" com.novocode" % " junit-interface" % " 0.11" % " test" ,
431
430
" org.scala-lang" % " scala-library" % scalacVersion % " test" ),
432
431
@@ -682,7 +681,7 @@ object Build {
682
681
libraryDependencies ++= Seq (
683
682
" com.typesafe.sbt" % " sbt-interface" % sbtVersion.value,
684
683
" org.scala-sbt" % " api" % sbtVersion.value % " test" ,
685
- " org.specs2" % " specs2_2.11 " % " 2.3.11" % " test"
684
+ ( " org.specs2" %% " specs2 " % " 2.3.11" % " test" ).withDottyCompat()
686
685
),
687
686
// The sources should be published with crossPaths := false since they
688
687
// need to be compiled by the project using the bridge.
0 commit comments