luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SI-7788 Adapt to renamed implict Predef.conforms 

In 2.11, the implicit version is named `$conforms` so as to avoid
accidental shadowing by user code, which renders methods using
views and subtype bounds inexplicable unusable.

But, SBT intentionally needs to hide it to make the implicits
in this file line up.

This commit opts-in the the required identifiers from Predef,
rather than opting out of conforms. This makes the same code
source compatible with 2.10 and 2.11.
This commit is contained in:
Jason Zaugg 2014-02-21 22:14:13 +01:00
parent 7221890b3d
commit 8c4527317f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/actions/src/main/scala/sbt/CacheIvy.scala
View File

@ -3,7 +3,7 @@
*/
package sbt
import Predef.{conforms => _, _}
import Predef.{Map, Set, implicitly} // excludes *both 2.10.x conforms and 2.11.x $conforms in source compatible manner.
import FileInfo.{exists, hash}
import java.io.File