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

Merge pull request #3095 from eed3si9n/fport/3089 

[fport] Add three slashes (u3) for file URI
This commit is contained in:
eugene yokota 2017-04-12 05:46:43 -04:00 committed by GitHub
parent d2e7207299 b0b5396769
commit 90e560aa55
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
launch/src/main/input_resources/sbt/sbt.boot.properties
View File

@ -12,8 +12,8 @@
[repositories] [repositories]
local local
local-preloaded-ivy: file://${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext] local-preloaded-ivy: file:///${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
local-preloaded: file://${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/} local-preloaded: file:///${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}
maven-central maven-central
sbt-maven-releases: https://repo.scala-sbt.org/scalasbt/maven-releases/, bootOnly sbt-maven-releases: https://repo.scala-sbt.org/scalasbt/maven-releases/, bootOnly
sbt-maven-snapshots: https://repo.scala-sbt.org/scalasbt/maven-snapshots/, bootOnly sbt-maven-snapshots: https://repo.scala-sbt.org/scalasbt/maven-snapshots/, bootOnly

2
main/src/main/scala/sbt/Defaults.scala
View File

@ -2290,7 +2290,7 @@ object Classpaths {
i.url.getProtocol match { i.url.getProtocol match {
case "file" => case "file" =>
// This hackery is to deal suitably with UNC paths on Windows. Once we can assume Java7, Paths should save us from this. // This hackery is to deal suitably with UNC paths on Windows. Once we can assume Java7, Paths should save us from this.
val file = try { new File(i.url.toURI) } catch { case e: java.net.URISyntaxException => new File(i.url.getPath) } val file = IO.toFile(i.url)
Resolver.file(i.id, file)(patterns) Resolver.file(i.id, file)(patterns)
case _ => Resolver.url(i.id, i.url)(patterns) case _ => Resolver.url(i.id, i.url)(patterns)
} }