Skip to content

Commit

Permalink
Fix old Dotty plugin compat
Browse files Browse the repository at this point in the history
**Problem**
scala/scala3#20157 identified that
`sbt-dotty/dotty-knowledge.i17` scripted test fails on sbt 1.10.0-RC2.
The regression happened in https://github.com/sbt/sbt/pull/7480/files#diff-6d9589bfb3f1247d2eace99bab7e928590337680d1aebd087d9da286586fba77L739-L740
where global setting was removed, and moved to project level.

**Solution**
This restores the global setting that is apparently referenced by
now defunct Dotty plugin.
  • Loading branch information
eed3si9n committed May 5, 2024
1 parent 8fe6e4e commit aac79df
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions main/src/main/scala/sbt/Defaults.scala
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,10 @@ object Defaults extends BuildCommon {
Seq(
auxiliaryClassFiles :== Nil,
incOptions := IncOptions.of(),
// TODO: Kept for old Dotty plugin. Remove on sbt 2.x
classpathOptions :== ClasspathOptionsUtil.boot,
// TODO: Kept for old Dotty plugin. Remove on sbt 2.x
console / classpathOptions :== ClasspathOptionsUtil.repl,
compileOrder :== CompileOrder.Mixed,
javacOptions :== Nil,
scalacOptions :== Nil,
Expand Down

0 comments on commit aac79df

Please sign in to comment.