Skip to content

Commit 74ebced

Browse files
Use directories from coursier
Which works better on Windows, in the upcoming coursier-interface version
1 parent 13df81f commit 74ebced

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
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 dev.dirs.ProjectDirectories
6+
import coursierapi.shaded.coursier.cache.shaded.dirs.dev.dirs.ProjectDirectories
77

88
object Defaults {
99
val Version = "0.9.3"

build.sbt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ lazy val shared = project
2828
name := "bloop-shared",
2929
libraryDependencies ++= Seq(
3030
Dependencies.bsp4s,
31+
Dependencies.coursierInterface,
3132
Dependencies.zinc,
3233
Dependencies.xxHashLibrary,
33-
Dependencies.configDirectories,
3434
Dependencies.sbtTestInterface,
3535
Dependencies.sbtTestAgent
3636
)
@@ -224,15 +224,18 @@ lazy val `bloopgun-core` = project
224224
buildInfoKeys := List(version),
225225
buildInfoObject := "BloopgunInfo",
226226
libraryDependencies ++= List(
227-
//Dependencies.configDirectories,
228227
Dependencies.snailgun,
229228
// Use zt-exec instead of nuprocess because it doesn't require JNA (good for graalvm)
230229
Dependencies.ztExec,
231230
Dependencies.coursierInterface,
232231
Dependencies.coursierInterfaceSubs,
233232
Dependencies.jsoniterCore,
234233
Dependencies.jsoniterMacros % Provided,
235-
Dependencies.libdaemonjvm.exclude("org.scala-sbt.ipcsocket", "ipcsocket"),
234+
Dependencies.libdaemonjvm
235+
.exclude("org.scala-sbt.ipcsocket", "ipcsocket")
236+
// remove these two when switching to libdaemon-jvm >= 0.0.8
237+
.exclude("dev.dirs", "directories")
238+
.exclude("io.get-coursier.jniutils", "windows-jni-utils"),
236239
Dependencies.ipcsocket
237240
)
238241
)

project/Dependencies.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ object Dependencies {
5353
val nailgun = "io.github.alexarchambault.bleep" % "nailgun-server" % "1.0.2"
5454
val javaDebug = "ch.epfl.scala" % "com-microsoft-java-debug-core" % javaDebugVersion
5555

56-
val configDirectories = "io.github.soc" % "directories" % configDirsVersion
5756
val libraryManagement = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion
5857
val scalazCore = "org.scalaz" %% "scalaz-core" % scalazVersion
5958
val scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % scalazVersion

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import java.nio.file.{
1414
Paths => NioPaths
1515
}
1616
import java.util
17-
import io.github.soc.directories.ProjectDirectories
17+
import coursierapi.shaded.coursier.cache.shaded.dirs.dev.dirs.ProjectDirectories // GetWinDirs
1818
import scala.collection.mutable
1919
import java.nio.file.NoSuchFileException
2020
import scala.util.Properties

0 commit comments

Comments
 (0)