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

Fix locating artifacts published locally #114

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix locating artifacts published locally #114

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/scala-sbt-0.13/explicitdeps/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ package object explicitdeps {
val defaultModuleFilter: ModuleFilter = sbt.DependencyFilter.moduleFilter()

// csrCacheDirectoryValueOpt, baseDirectoryValue are unused and are only present for forward compatibility
def getAllLibraryDeps(analysis: Analysis, log: sbt.util.Logger)(csrCacheDirectoryValueOpt: Option[String], baseDirectoryValue: String): Set[java.io.File] = {
def getAllLibraryDeps(analysis: Analysis, log: sbt.util.Logger)
(csrCacheDirectoryValueOpt: Option[String], baseDirectoryValue: String, ivyHomeValue: String): Set[java.io.File] = {
log.debug(
s"Source to library relations:\n${analysis.relations.binaryDep.all.map(r => s" ${r._1} -> ${r._2}").mkString("\n")}"
)
Expand Down
10 changes: 5 additions & 5 deletions src/main/scala-sbt-1.0/explicitdeps/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ package object explicitdeps {

val defaultModuleFilter: ModuleFilter = sbt.librarymanagement.DependencyFilter.moduleFilter()

private def toFile(x: AnyRef, csrCacheDirectoryValueOpt: Option[String], baseDirectoryValue: String): java.io.File = {
private def toFile(x: AnyRef, csrCacheDirectoryValueOpt: Option[String], baseDirectoryValue: String, ivyHomeValue: String): java.io.File = {
if (x.getClass.getSimpleName.contains("VirtualFile")) {
// sbt 1.4.0 or newer
val id = x.getClass.getMethod("id").invoke(x).toString
val path = id
.replaceAllLiterally("${CSR_CACHE}", csrCacheDirectoryValueOpt.mkString)
.replaceAllLiterally("${IVY_HOME}", ivyHomeValue)
.replaceAllLiterally("${BASE}", baseDirectoryValue)
new java.io.File(path)
} else {
Expand All @@ -22,14 +23,13 @@ package object explicitdeps {
}

def getAllLibraryDeps(analysis: Analysis, log: sbt.util.Logger)
(csrCacheDirectoryValueOpt: Option[String], baseDirectoryValue: String): Set[java.io.File] = {
(csrCacheDirectoryValueOpt: Option[String], baseDirectoryValue: String, ivyHomeValue: String): Set[java.io.File] = {
log.debug(
s"Source to library relations:\n${analysis.relations.libraryDep.all.map(r => s" ${r._1} -> ${r._2}").mkString("\n")}"
)
log.debug(s"Using CSR_CACHE=${csrCacheDirectoryValueOpt.mkString} BASE=$baseDirectoryValue")
log.debug(s"Using CSR_CACHE=${csrCacheDirectoryValueOpt.mkString} BASE=$baseDirectoryValue IVY_HOME=$ivyHomeValue")
val allLibraryDeps = analysis.relations.allLibraryDeps.asInstanceOf[Set[AnyRef]]
.map(x => toFile(x, csrCacheDirectoryValueOpt, baseDirectoryValue))
.toSet
.map(x => toFile(x, csrCacheDirectoryValueOpt, baseDirectoryValue, ivyHomeValue))
log.debug(s"Library dependencies:\n${allLibraryDeps.mkString(" ", "\n ", "")}")
allLibraryDeps
}
Expand Down
6 changes: 4 additions & 2 deletions src/main/scala/explicitdeps/ExplicitDepsPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ object ExplicitDepsPlugin extends AutoPlugin {
val projectName = name.value
val csrCacheDirectoryValueOpt = csrCacheDirectoryValueTask.value
val baseDirectoryValue = appConfiguration.value.baseDirectory().getCanonicalFile.toPath.toString
val allLibraryDeps = getAllLibraryDeps(compile.in(Compile).value.asInstanceOf[Analysis], log)(csrCacheDirectoryValueOpt, baseDirectoryValue)
val ivyHomeValue = appConfiguration.value.provider.scalaProvider.launcher.ivyHome.toString
val allLibraryDeps = getAllLibraryDeps(compile.in(Compile).value.asInstanceOf[Analysis], log)(csrCacheDirectoryValueOpt, baseDirectoryValue, ivyHomeValue)
val libraryDeps = libraryDependencies.value
val scalaBinaryVer = scalaBinaryVersion.value
val scalaFullVer = scalaVersion.value
Expand All @@ -79,7 +80,8 @@ object ExplicitDepsPlugin extends AutoPlugin {
val projectName = name.value
val csrCacheDirectoryValueOpt = csrCacheDirectoryValueTask.value
val baseDirectoryValue = appConfiguration.value.baseDirectory().getCanonicalFile.toPath.toString
val allLibraryDeps = getAllLibraryDeps(compile.in(Compile).value.asInstanceOf[Analysis], log)(csrCacheDirectoryValueOpt, baseDirectoryValue)
val ivyHomeValue = appConfiguration.value.provider.scalaProvider.launcher.ivyHome.toString
val allLibraryDeps = getAllLibraryDeps(compile.in(Compile).value.asInstanceOf[Analysis], log)(csrCacheDirectoryValueOpt, baseDirectoryValue, ivyHomeValue)
val libraryDeps = libraryDependencies.value
val scalaBinaryVer = scalaBinaryVersion.value
val scalaFullVer = scalaVersion.value
Expand Down