Update coursier to 2.0.16-161-g8a1b8eae5

VirtusLab · Oct 8, 2021 · 1db5934 · 1db5934
1 parent 78bf50f
commit 1db5934
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/modules/build/src/main/scala/scala/build/Directories.scala b/modules/build/src/main/scala/scala/build/Directories.scala
@@ -1,6 +1,6 @@
 package scala.build
 
-import dev.dirs.{GetWinDirs, ProjectDirectories}
+import coursier.cache.shaded.dirs.{GetWinDirs, ProjectDirectories}
 
 trait Directories {
   def localRepoDir: os.Path

diff --git a/modules/build/src/main/scala/scala/build/options/BuildOptions.scala b/modules/build/src/main/scala/scala/build/options/BuildOptions.scala
@@ -1,6 +1,6 @@
 package scala.build.options
 
-import coursier.cache.FileCache
+import coursier.cache.{ArchiveCache, FileCache}
 import coursier.jvm.{JavaHome, JvmCache, JvmIndex}
 import dependency._
 
@@ -154,7 +154,7 @@ final case class BuildOptions(
     val indexTask = JvmIndex.load(finalCache, indexUrl)
     val jvmCache = JvmCache()
       .withIndex(indexTask)
-      .withCache(finalCache)
+      .withArchiveCache(ArchiveCache().withCache(finalCache))
       .withOs(javaOptions.jvmIndexOs.getOrElse(OsLibc.jvmIndexOs))
       .withArchitecture(javaOptions.jvmIndexArch.getOrElse(JvmIndex.defaultArchitecture()))
     JavaHome().withCache(jvmCache)

diff --git a/modules/cli/src/main/scala/scala/cli/internal/FetchExternalBinary.scala b/modules/cli/src/main/scala/scala/cli/internal/FetchExternalBinary.scala
@@ -1,7 +1,6 @@
 package scala.cli.internal
 
-import coursier.cache.FileCache
-import coursier.jvm.ArchiveType
+import coursier.cache.{ArchiveType, FileCache, UnArchiver}
 import coursier.util.{Artifact, Task}
 
 import java.io.{FileInputStream, FileOutputStream, IOException}
@@ -47,7 +46,7 @@ object FetchExternalBinary {
               case _: IOException if Properties.isWin =>
             }
           try {
-            coursier.jvm.UnArchiver.default().extract(
+            UnArchiver.default().extract(
               ArchiveType.Zip,
               f.toIO,
               tmpDir.toIO,

diff --git a/project/deps.sc b/project/deps.sc
@@ -36,7 +36,9 @@ object TestDeps {
 
 object Deps {
   object Versions {
-    def coursier      = "2.0.16+73-gddc6d9cc9"
+    // jni-utils version may need to be sync-ed when bumping the coursier version
+    def coursier = "2.0.16-161-g8a1b8eae5"
+
     def scalaJs       = "1.5.1"
     def scalaMeta     = "4.4.28"
     def scalaNative   = "0.4.0"
@@ -56,7 +58,7 @@ object Deps {
   def guava             = ivy"com.google.guava:guava:18.0"
   def ipcSocket         = ivy"com.github.alexarchambault.tmp.ipcsocket:ipcsocket:1.4.1-aa-2"
   def jimfs             = ivy"com.google.jimfs:jimfs:1.2"
-  def jniUtils          = ivy"io.get-coursier.jniutils:windows-jni-utils:0.3.1"
+  def jniUtils          = ivy"io.get-coursier.jniutils:windows-jni-utils:0.3.2"
   def macroParadise     = ivy"org.scalamacros:::paradise:2.1.1"
   def munit             = ivy"org.scalameta::munit:0.7.25"
   def nativeTestRunner  = ivy"org.scala-native::test-runner:${Versions.scalaNative}"