Skip to content

Commit 4e8c644

Browse files
Update coursier-interface to 1.0.5
1 parent 74ebced commit 4e8c644

File tree

3 files changed

+31
-5
lines changed

3 files changed

+31
-5
lines changed

bloopgun-core/src/main/scala/bloop/bloopgun/Defaults.scala

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package bloop.bloopgun
33
import java.nio.file.attribute.PosixFilePermissions
44
import java.nio.file.{Files, Path, Paths}
55
import scala.util.Properties
6-
import coursierapi.shaded.coursier.cache.shaded.dirs.dev.dirs.ProjectDirectories
6+
import coursierapi.shaded.coursier.cache.shaded.dirs.{GetWinDirs, ProjectDirectories}
77

88
object Defaults {
99
val Version = "0.9.3"
@@ -21,7 +21,20 @@ object Defaults {
2121
}
2222

2323
// also more or less in bloop.io.Paths…
24-
private lazy val projectDirectories = ProjectDirectories.from("", "", "bloop")
24+
private lazy val projectDirectories = {
25+
val getWinDirs: GetWinDirs =
26+
if (coursierapi.shaded.coursier.paths.Util.useJni())
27+
new GetWinDirs {
28+
def getWinDirs(guids: String*) =
29+
guids.map { guid =>
30+
coursierapi.shaded.coursier.jniutils.WindowsKnownFolders
31+
.knownFolderPath("{" + guid + "}")
32+
}.toArray
33+
}
34+
else
35+
GetWinDirs.powerShellBased
36+
ProjectDirectories.from("", "", "bloop", getWinDirs)
37+
}
2538
private lazy val bloopCacheDir: Path = Paths.get(projectDirectories.cacheDir)
2639
private lazy val bloopDataDir: Path = Paths.get(projectDirectories.dataDir)
2740

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ object Dependencies {
5656
val libraryManagement = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion
5757
val scalazCore = "org.scalaz" %% "scalaz-core" % scalazVersion
5858
val scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % scalazVersion
59-
val coursierInterface = "io.get-coursier" % "interface" % "1.0.4"
59+
val coursierInterface = "io.get-coursier" % "interface" % "1.0.5"
6060
val coursierInterfaceSubs = "io.get-coursier" % "interface-svm-subs" % "1.0.4"
6161
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % scalaXmlVersion
6262
val scalaCollectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2"

shared/src/main/scala/bloop/io/Paths.scala

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,26 @@ import java.nio.file.{
1414
Paths => NioPaths
1515
}
1616
import java.util
17-
import coursierapi.shaded.coursier.cache.shaded.dirs.dev.dirs.ProjectDirectories // GetWinDirs
17+
import coursierapi.shaded.coursier.cache.shaded.dirs.{GetWinDirs, ProjectDirectories}
1818
import scala.collection.mutable
1919
import java.nio.file.NoSuchFileException
2020
import scala.util.Properties
2121

2222
object Paths {
23-
private lazy val projectDirectories = ProjectDirectories.from("", "", "bloop")
23+
private lazy val projectDirectories = {
24+
val getWinDirs: GetWinDirs =
25+
if (coursierapi.shaded.coursier.paths.Util.useJni())
26+
new GetWinDirs {
27+
def getWinDirs(guids: String*) =
28+
guids.map { guid =>
29+
coursierapi.shaded.coursier.jniutils.WindowsKnownFolders
30+
.knownFolderPath("{" + guid + "}")
31+
}.toArray
32+
}
33+
else
34+
GetWinDirs.powerShellBased
35+
ProjectDirectories.from("", "", "bloop", getWinDirs)
36+
}
2437
private def createDirFor(filepath: String): AbsolutePath =
2538
AbsolutePath(Files.createDirectories(NioPaths.get(filepath)))
2639

0 commit comments

Comments
 (0)