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

Support sbt 1.4.0 when COURSIER_CACHE is overridden #75

Merged
merged 3 commits into from
Oct 20, 2020
Merged

Support sbt 1.4.0 when COURSIER_CACHE is overridden #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad207bb
Support sbt 1.4.0 when COURSIER_CACHE is overridden
Oct 19, 2020
e2e1d4a
Add test with coursier overridden
Oct 19, 2020
8de2fec
Revert "Add test with coursier overridden"
Oct 20, 2020
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
4 changes: 2 additions & 2 deletions 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 @@ -6,8 +6,8 @@ package object explicitdeps {

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

// csrCacheDirectoryValueOpt is unused and only present for forward compatibility
def getAllLibraryDeps(analysis: Analysis, log: sbt.util.Logger)(csrCacheDirectoryValueOpt: Option[String]): Set[java.io.File] = {
// 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] = {
log.debug(
s"Source to library relations:\n${analysis.relations.binaryDep.all.map(r => s" ${r._1} -> ${r._2}").mkString("\n")}"
)
Expand Down
12 changes: 8 additions & 4 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 @@ -6,24 +6,28 @@ package object explicitdeps {

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

private def toFile(x: AnyRef, csrCacheDirectoryValueOpt: Option[String]): java.io.File = {
private def toFile(x: AnyRef, csrCacheDirectoryValueOpt: Option[String], baseDirectoryValue: 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)
val path = id
.replaceAllLiterally("${CSR_CACHE}", csrCacheDirectoryValueOpt.mkString)
.replaceAllLiterally("${BASE}", baseDirectoryValue)
new java.io.File(path)
} else {
// sbt 1.3.x or older
x.asInstanceOf[java.io.File]
}
}

def getAllLibraryDeps(analysis: Analysis, log: sbt.util.Logger)(csrCacheDirectoryValueOpt: Option[String]): Set[java.io.File] = {
def getAllLibraryDeps(analysis: Analysis, log: sbt.util.Logger)
(csrCacheDirectoryValueOpt: Option[String], baseDirectoryValue: 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")
val allLibraryDeps = analysis.relations.allLibraryDeps.asInstanceOf[Set[AnyRef]]
.map(x => toFile(x, csrCacheDirectoryValueOpt))
.map(x => toFile(x, csrCacheDirectoryValueOpt, baseDirectoryValue))
.toSet
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 @@ -51,7 +51,8 @@ object ExplicitDepsPlugin extends AutoPlugin {
val log = streams.value.log
val projectName = name.value
val csrCacheDirectoryValueOpt = csrCacheDirectoryValueTask.value
val allLibraryDeps = getAllLibraryDeps(compile.in(Compile).value.asInstanceOf[Analysis], log)(csrCacheDirectoryValueOpt)
val baseDirectoryValue = appConfiguration.value.baseDirectory().getCanonicalFile.toPath.toString
val allLibraryDeps = getAllLibraryDeps(compile.in(Compile).value.asInstanceOf[Analysis], log)(csrCacheDirectoryValueOpt, baseDirectoryValue)
val libraryDeps = libraryDependencies.value
val scalaBinaryVer = scalaBinaryVersion.value
val filter = undeclaredCompileDependenciesFilter.value
Expand All @@ -76,7 +77,8 @@ object ExplicitDepsPlugin extends AutoPlugin {
val log = streams.value.log
val projectName = name.value
val csrCacheDirectoryValueOpt = csrCacheDirectoryValueTask.value
val allLibraryDeps = getAllLibraryDeps(compile.in(Compile).value.asInstanceOf[Analysis], log)(csrCacheDirectoryValueOpt)
val baseDirectoryValue = appConfiguration.value.baseDirectory().getCanonicalFile.toPath.toString
val allLibraryDeps = getAllLibraryDeps(compile.in(Compile).value.asInstanceOf[Analysis], log)(csrCacheDirectoryValueOpt, baseDirectoryValue)
val libraryDeps = libraryDependencies.value
val scalaBinaryVer = scalaBinaryVersion.value
val filter = unusedCompileDependenciesFilter.value
Expand Down