Merge pull request #8408 from eed3si9n/wip/bridge-hack

Extend the Gradle / sbt 0.13 leniency to Windows
scala · Sep 10, 2019 · ead235c · ead235c
2 parents f797de2 + 8509b0c
commit ead235c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/compiler/scala/tools/nsc/Reporting.scala b/src/compiler/scala/tools/nsc/Reporting.scala
@@ -115,7 +115,9 @@ trait Reporting extends scala.reflect.internal.Reporting { self: ast.Positions w
       val msg = s"$featureDesc $req be enabled\nby making the implicit value $fqname visible.$explain" replace ("#", construct)
       // don't error on postfix in pre-0.13.18 xsbt/Compat.scala
       def isSbtCompat =
-        (featureName == "postfixOps" && pos.source.path.endsWith("/xsbt/Compat.scala") && Thread.currentThread.getStackTrace.exists(_.getClassName.startsWith("sbt.")))
+        (featureName == "postfixOps" &&
+        (pos.source.path.endsWith("/xsbt/Compat.scala") || pos.source.path.endsWith("""\xsbt\Compat.scala""")) &&
+        Thread.currentThread.getStackTrace.exists(_.getClassName.startsWith("sbt.")))
       if (required && !isSbtCompat) {
         reporter.error(pos, msg)
       } else featureWarning(pos, msg)