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

Merge pull request #321 from alexarchambault/topic/utf-8-bom 

Ignore UTF-8 BOM in metadata files
This commit is contained in:
Alexandre Archambault 2016-08-15 16:14:00 +02:00 committed by GitHub
parent b6b6f54e17 6aebdac008
commit fac264f7b7
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cache/src/main/scala/coursier/Cache.scala vendored
View File

@ -832,6 +832,8 @@ object Cache {
} }
} }
private val utf8Bom = "\ufeff"
def fetch( def fetch(
cache: File = default, cache: File = default,
cachePolicy: CachePolicy = CachePolicy.FetchMissing, cachePolicy: CachePolicy = CachePolicy.FetchMissing,
@ -853,7 +855,9 @@ object Cache {
val res = if (!f.isDirectory && f.exists()) { val res = if (!f.isDirectory && f.exists()) {
Try(new String(NioFiles.readAllBytes(f.toPath), "UTF-8")) match { Try(new String(NioFiles.readAllBytes(f.toPath), "UTF-8")) match {
case scala.util.Success(content) => case scala.util.Success(content) =>
Right(content) // stripping any UTF-8 BOM if any, see
// https://github.com/alexarchambault/coursier/issues/316 and the corresponding test
Right(content.stripPrefix(utf8Bom))
case scala.util.Failure(e) => case scala.util.Failure(e) =>
Left(s"Could not read (file:${f.getCanonicalPath}): ${e.getMessage}") Left(s"Could not read (file:${f.getCanonicalPath}): ${e.getMessage}")
} }

1
tests/shared/src/test/resources/resolutions/dk.brics.automaton/automaton/1.11-8 Normal file
View File

@ -0,0 +1 @@
dk.brics.automaton:automaton:1.11-8:compile

7
tests/shared/src/test/scala/coursier/test/CentralTests.scala
View File

@ -399,6 +399,13 @@ object CentralTests extends TestSuite {
} }
} }
} }
'ignoreUtf8Bom - {
resolutionCheck(
Module("dk.brics.automaton", "automaton"),
"1.11-8"
)
}
} }
} }