Merge pull request #33 from scala-cli/coursier-directories

Use directories from coursier

Author: alexarchambault

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

@@ -3,7 +3,7 @@ package bloop.bloopgun
 import java.nio.file.attribute.PosixFilePermissions
 import java.nio.file.{Files, Path, Paths}
 import scala.util.Properties
-import dev.dirs.ProjectDirectories
+import coursierapi.shaded.coursier.cache.shaded.dirs.{GetWinDirs, ProjectDirectories}
 
 object Defaults {
   val Version = "0.9.3"
@@ -21,7 +21,20 @@ object Defaults {
   }
 
   // also more or less in bloop.io.Paths…
-  private lazy val projectDirectories = ProjectDirectories.from("", "", "bloop")
+  private lazy val projectDirectories = {
+    val getWinDirs: GetWinDirs =
+      if (coursierapi.shaded.coursier.paths.Util.useJni())
+        new GetWinDirs {
+          def getWinDirs(guids: String*) =
+            guids.map { guid =>
+              coursierapi.shaded.coursier.jniutils.WindowsKnownFolders
+                .knownFolderPath("{" + guid + "}")
+            }.toArray
+        }
+      else
+        GetWinDirs.powerShellBased
+    ProjectDirectories.from("", "", "bloop", getWinDirs)
+  }
   private lazy val bloopCacheDir: Path = Paths.get(projectDirectories.cacheDir)
   private lazy val bloopDataDir: Path = Paths.get(projectDirectories.dataDir)
 

build.sbt

@@ -28,9 +28,9 @@ lazy val shared = project
     name := "bloop-shared",
     libraryDependencies ++= Seq(
       Dependencies.bsp4s,
+      Dependencies.coursierInterface,
       Dependencies.zinc,
       Dependencies.xxHashLibrary,
-      Dependencies.configDirectories,
       Dependencies.sbtTestInterface,
       Dependencies.sbtTestAgent
     )
@@ -224,15 +224,18 @@ lazy val `bloopgun-core` = project
     buildInfoKeys := List(version),
     buildInfoObject := "BloopgunInfo",
     libraryDependencies ++= List(
-      //Dependencies.configDirectories,
       Dependencies.snailgun,
       // Use zt-exec instead of nuprocess because it doesn't require JNA (good for graalvm)
       Dependencies.ztExec,
       Dependencies.coursierInterface,
       Dependencies.coursierInterfaceSubs,
       Dependencies.jsoniterCore,
       Dependencies.jsoniterMacros % Provided,
-      Dependencies.libdaemonjvm.exclude("org.scala-sbt.ipcsocket", "ipcsocket"),
+      Dependencies.libdaemonjvm
+        .exclude("org.scala-sbt.ipcsocket", "ipcsocket")
+        // remove these two when switching to libdaemon-jvm >= 0.0.8
+        .exclude("dev.dirs", "directories")
+        .exclude("io.get-coursier.jniutils", "windows-jni-utils"),
       Dependencies.ipcsocket
     )
   )

project/Dependencies.scala

@@ -53,11 +53,10 @@ object Dependencies {
   val nailgun = "io.github.alexarchambault.bleep" % "nailgun-server" % "1.0.2"
   val javaDebug = "ch.epfl.scala" % "com-microsoft-java-debug-core" % javaDebugVersion
 
-  val configDirectories = "io.github.soc" % "directories" % configDirsVersion
   val libraryManagement = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion
   val scalazCore = "org.scalaz" %% "scalaz-core" % scalazVersion
   val scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % scalazVersion
-  val coursierInterface = "io.get-coursier" % "interface" % "1.0.4"
+  val coursierInterface = "io.get-coursier" % "interface" % "1.0.5"
   val coursierInterfaceSubs = "io.get-coursier" % "interface-svm-subs" % "1.0.4"
   val scalaXml = "org.scala-lang.modules" %% "scala-xml" % scalaXmlVersion
   val scalaCollectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2"

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

@@ -14,13 +14,26 @@ import java.nio.file.{
   Paths => NioPaths
 }
 import java.util
-import io.github.soc.directories.ProjectDirectories
+import coursierapi.shaded.coursier.cache.shaded.dirs.{GetWinDirs, ProjectDirectories}
 import scala.collection.mutable
 import java.nio.file.NoSuchFileException
 import scala.util.Properties
 
 object Paths {
-  private lazy val projectDirectories = ProjectDirectories.from("", "", "bloop")
+  private lazy val projectDirectories = {
+    val getWinDirs: GetWinDirs =
+      if (coursierapi.shaded.coursier.paths.Util.useJni())
+        new GetWinDirs {
+          def getWinDirs(guids: String*) =
+            guids.map { guid =>
+              coursierapi.shaded.coursier.jniutils.WindowsKnownFolders
+                .knownFolderPath("{" + guid + "}")
+            }.toArray
+        }
+      else
+        GetWinDirs.powerShellBased
+    ProjectDirectories.from("", "", "bloop", getWinDirs)
+  }
   private def createDirFor(filepath: String): AbsolutePath =
     AbsolutePath(Files.createDirectories(NioPaths.get(filepath)))