@@ -15,6 +15,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
15
15
import sbt .Package .ManifestAttributes
16
16
17
17
import com .typesafe .sbteclipse .plugin .EclipsePlugin ._
18
+ import dotty .tools .sbtplugin .DottyPlugin .autoImport ._
18
19
19
20
/* In sbt 0.13 the Build trait would expose all vals to the shell, where you
20
21
* can use them in "set a := b" like expressions. This re-exposes them.
@@ -132,8 +133,6 @@ object Build {
132
133
EclipseKeys .skipProject := true ,
133
134
version := dottyVersion,
134
135
scalaVersion := dottyNonBootstrappedVersion,
135
- scalaOrganization := dottyOrganization,
136
- scalaBinaryVersion := " 0.1" ,
137
136
138
137
// Avoid having to run `dotty-sbt-bridge/publishLocal` before compiling a bootstrapped project
139
138
scalaCompilerBridgeSource :=
@@ -174,9 +173,9 @@ object Build {
174
173
libraryDependencies ++= {
175
174
if (bootstrapFromPublishedJars.value)
176
175
Seq (
177
- dottyOrganization % " dotty-library_2.11 " % dottyNonBootstrappedVersion % Configurations .ScalaTool .name,
178
- dottyOrganization % " dotty-compiler_2.11 " % dottyNonBootstrappedVersion % Configurations .ScalaTool .name
179
- )
176
+ dottyOrganization %% " dotty-library " % dottyNonBootstrappedVersion % Configurations .ScalaTool .name,
177
+ dottyOrganization %% " dotty-compiler " % dottyNonBootstrappedVersion % Configurations .ScalaTool .name
178
+ ).map(_.withDottyCompat())
180
179
else
181
180
Seq ()
182
181
},
@@ -439,7 +438,7 @@ object Build {
439
438
440
439
// get libraries onboard
441
440
libraryDependencies ++= Seq (" com.typesafe.sbt" % " sbt-interface" % sbtVersion.value,
442
- " org.scala-lang.modules" % " scala-xml_2.11 " % " 1.0.1" ,
441
+ ( " org.scala-lang.modules" %% " scala-xml " % " 1.0.1" ).withDottyCompat() ,
443
442
" com.novocode" % " junit-interface" % " 0.11" % " test" ,
444
443
" org.scala-lang" % " scala-library" % scalacVersion % " test" ),
445
444
@@ -695,7 +694,7 @@ object Build {
695
694
libraryDependencies ++= Seq (
696
695
" com.typesafe.sbt" % " sbt-interface" % sbtVersion.value,
697
696
" org.scala-sbt" % " api" % sbtVersion.value % " test" ,
698
- " org.specs2" % " specs2_2.11 " % " 2.3.11" % " test"
697
+ ( " org.specs2" %% " specs2 " % " 2.3.11" % " test" ).withDottyCompat()
699
698
),
700
699
// The sources should be published with crossPaths := false since they
701
700
// need to be compiled by the project using the bridge.
0 commit comments