@@ -530,7 +530,7 @@ object Build {
530
530
// FIXME: Not needed, but should be on the compiler CP
531
531
(" org.scala-lang.modules" %% " scala-xml" % " 1.1.0" ).withDottyCompat(scalaVersion.value),
532
532
" org.scala-lang" % " scala-library" % scalacVersion % " test" ,
533
- Dependencies .compilerInterface(sbtVersion.value) ,
533
+ Dependencies .`compiler-interface` ,
534
534
" org.jline" % " jline-reader" % " 3.9.0" , // used by the REPL
535
535
" org.jline" % " jline-terminal" % " 3.9.0" ,
536
536
" org.jline" % " jline-terminal-jna" % " 3.9.0" // needed for Windows
@@ -799,8 +799,8 @@ object Build {
799
799
description := " sbt compiler bridge for Dotty" ,
800
800
resolvers += Resolver .typesafeIvyRepo(" releases" ), // For org.scala-sbt:api
801
801
libraryDependencies ++= Seq (
802
- Dependencies .compilerInterface(sbtVersion.value) % Provided ,
803
- (Dependencies .zincApiinfo(sbtVersion.value) % Test ).withDottyCompat(scalaVersion.value)
802
+ Dependencies .`compiler-interface` % Provided ,
803
+ (Dependencies .`zinc-api-info` % Test ).withDottyCompat(scalaVersion.value)
804
804
),
805
805
// The sources should be published with crossPaths := false since they
806
806
// need to be compiled by the project using the bridge.
@@ -928,6 +928,7 @@ object Build {
928
928
// sbt plugin to use Dotty in your own build, see
929
929
// https://github.com/lampepfl/dotty-example-project for usage.
930
930
lazy val `sbt-dotty` = project.in(file(" sbt-dotty" )).
931
+ enablePlugins(ScriptedPlugin ).
931
932
settings(commonSettings).
932
933
settings(
933
934
version := {
@@ -938,7 +939,7 @@ object Build {
938
939
// Keep in sync with inject-sbt-dotty.sbt
939
940
libraryDependencies ++= Seq (
940
941
Dependencies .`jackson-databind`,
941
- Dependencies .compilerInterface(sbtVersion.value)
942
+ Dependencies .`compiler-interface`
942
943
),
943
944
unmanagedSourceDirectories in Compile +=
944
945
baseDirectory.value / " ../language-server/src/dotty/tools/languageserver/config" ,
@@ -1253,7 +1254,6 @@ object Build {
1253
1254
1254
1255
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
1255
1256
def asDottyRoot (implicit mode : Mode ): Project = project.withCommonSettings.
1256
- disablePlugins(ScriptedPlugin ).
1257
1257
aggregate(`dotty-interfaces`, dottyLibrary, dottyCompiler, dottyDoc, dottySbtBridgeReference).
1258
1258
bootstrappedAggregate(`scala-library`, `scala-compiler`, `scala-reflect`, scalap, `dotty-language-server`).
1259
1259
dependsOn(dottyCompiler).
@@ -1263,38 +1263,32 @@ object Build {
1263
1263
)
1264
1264
1265
1265
def asDottyCompiler (implicit mode : Mode ): Project = project.withCommonSettings.
1266
- disablePlugins(ScriptedPlugin ).
1267
1266
dependsOn(`dotty-interfaces`).
1268
1267
dependsOn(dottyLibrary).
1269
1268
settings(dottyCompilerSettings)
1270
1269
1271
1270
def asDottyLibrary (implicit mode : Mode ): Project = project.withCommonSettings.
1272
- disablePlugins(ScriptedPlugin ).
1273
1271
settings(dottyLibrarySettings).
1274
1272
bootstrappedSettings(
1275
1273
// Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called.
1276
1274
scalacOptions in Compile ++= Seq (" -sourcepath" , (scalaSource in Compile ).value.getAbsolutePath)
1277
1275
)
1278
1276
1279
1277
def asDottyDoc (implicit mode : Mode ): Project = project.withCommonSettings.
1280
- disablePlugins(ScriptedPlugin ).
1281
1278
dependsOn(dottyCompiler, dottyCompiler % " test->test" ).
1282
1279
settings(dottyDocSettings)
1283
1280
1284
1281
def asDottySbtBridge (implicit mode : Mode ): Project = project.withCommonSettings.
1285
- disablePlugins(ScriptedPlugin ).
1286
1282
dependsOn(dottyCompiler % Provided ).
1287
1283
dependsOn(dottyDoc % Provided ).
1288
1284
settings(dottySbtBridgeSettings)
1289
1285
1290
1286
def asDottyBench (implicit mode : Mode ): Project = project.withCommonSettings.
1291
- disablePlugins(ScriptedPlugin ).
1292
1287
dependsOn(dottyCompiler).
1293
1288
settings(commonBenchmarkSettings).
1294
1289
enablePlugins(JmhPlugin )
1295
1290
1296
1291
def asDist (implicit mode : Mode ): Project = project.
1297
- disablePlugins(ScriptedPlugin ).
1298
1292
enablePlugins(PackPlugin ).
1299
1293
withCommonSettings.
1300
1294
dependsOn(`dotty-interfaces`, dottyCompiler, dottyLibrary, dottyDoc).
0 commit comments