Use class-path-util library

coursier · Apr 21, 2023 · 84c51ff · 84c51ff
1 parent 5e0af12
commit 84c51ff
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 58 deletions.
diff --git a/build.sc b/build.sc
@@ -556,6 +556,7 @@ trait Cli extends CsModule with CoursierPublishModule with Launchers {
     Deps.caseApp,
     Deps.catsCore,
     Deps.catsFree,
+    Deps.classPathUtil,
     Deps.dataClass,
     Deps.monadlessCats,
     Deps.monadlessStdlib,

diff --git a/modules/cli/src/main/scala/coursier/cli/params/SharedLaunchParams.scala b/modules/cli/src/main/scala/coursier/cli/params/SharedLaunchParams.scala
@@ -8,7 +8,7 @@ import coursier.cli.fetch.FetchParams
 import coursier.cli.install.SharedChannelParams
 import coursier.cli.options.SharedLaunchOptions
 import coursier.cli.resolve.SharedResolveParams
-import coursier.cli.util.ClassPathUtil
+import coursier.cputil.ClassPathUtil
 
 final case class SharedLaunchParams(
   resolve: SharedResolveParams,
@@ -79,7 +79,7 @@ object SharedLaunchParams {
     }
 
     // check if those exist?
-    val extraJars = options.extraJars.flatMap(ClassPathUtil.classPath(_, sys.props.get))
+    val extraJars = options.extraJars.flatMap(ClassPathUtil.classPath(_))
 
     (resolveV, artifactV, sharedLoaderV, propertiesV).mapN {
       (resolve, artifact, sharedLoader, properties) =>

diff --git a/modules/cli/src/main/scala/coursier/cli/util/ClassPathUtil.scala b/modules/cli/src/main/scala/coursier/cli/util/ClassPathUtil.scala
diff --git a/project/deps.sc b/project/deps.sc
@@ -6,6 +6,7 @@ object Deps {
   def catsCore          = ivy"org.typelevel::cats-core:${Versions.cats}"
   def catsFree          = ivy"org.typelevel::cats-free:${Versions.cats}"
   def catsEffect        = ivy"org.typelevel::cats-effect::3.4.8"
+  def classPathUtil     = ivy"io.get-coursier::class-path-util:0.1.1"
   def collectionCompat  = ivy"org.scala-lang.modules::scala-collection-compat::2.9.0"
   def concurrentReferenceHashMap =
     ivy"io.github.alexarchambault:concurrent-reference-hash-map:1.1.0"