diff --git a/project/build.sbt b/project/build.sbt index 7631c96def0a..3d61db3c3623 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,2 +1,16 @@ // Used by VersionUtil to get gitHash and commitDate libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "4.11.0.201803080745-r" + +// Include the sources of the sbt-dotty plugin in the project build, +// so that we can use the current in-development version of the plugin +// in our build instead of a released version. + +unmanagedSourceDirectories in Compile += baseDirectory.value / "../sbt-dotty/src" + +// Keep in sync with `sbt-dotty` config in Build.scala +libraryDependencies ++= Seq( + Dependencies.`jackson-databind`, + Dependencies.`compiler-interface` +) +unmanagedSourceDirectories in Compile += + baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config" diff --git a/project/inject-sbt-dotty.sbt b/project/inject-sbt-dotty.sbt deleted file mode 100644 index d2962d3d901e..000000000000 --- a/project/inject-sbt-dotty.sbt +++ /dev/null @@ -1,13 +0,0 @@ -// Include the sources of the sbt-dotty plugin in the project build, -// so that we can use the current in-development version of the plugin -// in our build instead of a released version. - -unmanagedSourceDirectories in Compile += baseDirectory.value / "../sbt-dotty/src" - -// Keep in sync with `sbt-dotty` config in Build.scala -libraryDependencies ++= Seq( - Dependencies.`jackson-databind`, - Dependencies.`compiler-interface` -) -unmanagedSourceDirectories in Compile += - baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config" diff --git a/project/scripted.sbt b/project/scripted.sbt deleted file mode 100644 index a7d7ecccf2a9..000000000000 --- a/project/scripted.sbt +++ /dev/null @@ -1,2 +0,0 @@ -// Used by the subproject dotty-bridge -libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value