Extend the Gradle / sbt 0.13 leniency to Windows #8408
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes scala/bug#11731 postfixOps error exempts `/xsbt/Compat.scala` specifically to allow sbt 0.13 to work with Scala 2.13.0. Because this uses forward slash, apparently this did not work on Windows. This extends the compassion to Gradle + Windows users.
This was referenced Sep 10, 2019
eed3si9n
commented
Sep 10, 2019
| @@ -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""")) && | |||
There was a problem hiding this comment.
I thought about converting this to URL etc to make / and \ checking more elegant, but in the end figured doing the String#endsWith twice would be cheaper.
There was a problem hiding this comment.
You can also use java.io.File.pathSeparator in the cross-platform project setup.
There was a problem hiding this comment.
You mean java.io.File.separator I assume. I'm not sure how Cygwin etc interacts on Windows in that regard.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes scala/bug#11731
postfixOps error exempts
/xsbt/Compat.scalaspecifically to allow sbt 0.13 to workwith Scala 2.13.0. Because this uses forward slash, apparently this did not work on Windows. This extends the compassion to Gradle + Windows users.