Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use class-path-util library #2747

Merged
merged 1 commit into from
Apr 21, 2023
Merged

Use class-path-util library #2747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions modules/cli/src/main/scala/coursier/cli/params/SharedLaunchParams.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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) =>
Expand Down
56 changes: 0 additions & 56 deletions modules/cli/src/main/scala/coursier/cli/util/ClassPathUtil.scala
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions project/deps.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down