Merge pull request #73 from anilkumarmyla/easier_path

Support sbt 1.4.0

Author: cb372

.travis.yml

@@ -10,7 +10,10 @@ matrix:
   - env: SBT_VERSION="1.2.8"
     scala: 2.12.11
 
-  - env: SBT_VERSION="1.3.8"
+  - env: SBT_VERSION="1.3.13"
+    scala: 2.12.11
+
+  - env: SBT_VERSION="1.4.0"
     scala: 2.12.11
 
 cache:

build.sbt

@@ -1,9 +1,18 @@
 import ReleaseTransformations._
 
 enablePlugins(SbtPlugin)
-val latestSbt_0_13_version = "0.13.18"
-val latestSbt_1_x_version = "1.3.8"
-crossSbtVersions := Seq(latestSbt_0_13_version, "1.2.8", latestSbt_1_x_version)
+
+val latestSbt_0_13_x_version = "0.13.18"
+val latestSbt_1_2_x_version = "1.2.8"
+val latestSbt_1_3_x_version = "1.3.13"
+val latestSbt_1_4_x_version = "1.4.0"
+
+crossSbtVersions := Seq(
+  latestSbt_0_13_x_version,
+  latestSbt_1_2_x_version,
+  latestSbt_1_3_x_version,
+  latestSbt_1_4_x_version
+)
 
 scalaVersion := "2.12.11"
 organization := "com.github.cb372"
@@ -24,8 +33,8 @@ releaseProcess := Seq[ReleaseStep](
   setReleaseVersion,
   commitReleaseVersion,
   tagRelease,
-  releaseStepCommandAndRemaining(s"^^$latestSbt_0_13_version publish"),
-  releaseStepCommandAndRemaining(s"^^$latestSbt_1_x_version publish"),
+  releaseStepCommandAndRemaining(s"^^$latestSbt_0_13_x_version publish"),
+  releaseStepCommandAndRemaining(s"^^$latestSbt_1_3_x_version publish"), // Note: if we publish with 1.4.0, the plugin will only work with 1.4.x
   releaseStepTask(updateVersionInExampleProject),
   setNextVersion,
   commitNextVersion,

src/main/scala-sbt-0.13/explicitdeps/package.scala

@@ -6,7 +6,8 @@ package object explicitdeps {
 
   val defaultModuleFilter: ModuleFilter = sbt.DependencyFilter.moduleFilter()
 
-  def getAllLibraryDeps(analysis: Analysis, log: sbt.util.Logger): Set[java.io.File] = {
+  // csrCacheDirectoryValueOpt is unused and only present for forward compatibility
+  def getAllLibraryDeps(analysis: Analysis, log: sbt.util.Logger)(csrCacheDirectoryValueOpt: Option[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")}"
     )

src/main/scala-sbt-1.0/explicitdeps/package.scala

@@ -6,11 +6,25 @@ package object explicitdeps {
 
   val defaultModuleFilter: ModuleFilter = sbt.librarymanagement.DependencyFilter.moduleFilter()
 
-  def getAllLibraryDeps(analysis: Analysis, log: sbt.util.Logger): Set[java.io.File] = {
+  private def toFile(x: AnyRef, csrCacheDirectoryValueOpt: Option[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)
+      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] = {
     log.debug(
       s"Source to library relations:\n${analysis.relations.libraryDep.all.map(r => s"  ${r._1} -> ${r._2}").mkString("\n")}"
     )
-    val allLibraryDeps = analysis.relations.allLibraryDeps.toSet
+    val allLibraryDeps = analysis.relations.allLibraryDeps.asInstanceOf[Set[AnyRef]]
+      .map(x => toFile(x, csrCacheDirectoryValueOpt))
+      .toSet
     log.debug(s"Library dependencies:\n${allLibraryDeps.mkString("  ", "\n  ", "")}")
     allLibraryDeps
   }

src/main/scala/explicitdeps/ExplicitDepsPlugin.scala

@@ -35,10 +35,23 @@ object ExplicitDepsPlugin extends AutoPlugin {
     unusedCompileDependenciesFilter := defaultModuleFilter
   )
 
+  // Evaluate "csrCacheDirectory" setting which is present only in sbt 1.3.0 or newer
+  private lazy val csrCacheDirectoryValueTask = Def.task {
+    val extracted: Extracted = Project.extract(state.value)
+    val settings = extracted.session.original
+    settings.find(_.key.key.label == "csrCacheDirectory") match {
+      case Some(csrCacheDirectorySetting) =>
+        val csrCacheDirectoryValue = csrCacheDirectorySetting.init.evaluate(extracted.structure.data).toString
+        Some(csrCacheDirectoryValue)
+      case _ => None
+    }
+  }
+
   lazy val undeclaredCompileDependenciesTask = Def.task {
     val log = streams.value.log
     val projectName = name.value
-    val allLibraryDeps = getAllLibraryDeps(compile.in(Compile).value.asInstanceOf[Analysis], log)
+    val csrCacheDirectoryValueOpt = csrCacheDirectoryValueTask.value
+    val allLibraryDeps = getAllLibraryDeps(compile.in(Compile).value.asInstanceOf[Analysis], log)(csrCacheDirectoryValueOpt)
     val libraryDeps = libraryDependencies.value
     val scalaBinaryVer = scalaBinaryVersion.value
     val filter = undeclaredCompileDependenciesFilter.value
@@ -62,7 +75,8 @@ object ExplicitDepsPlugin extends AutoPlugin {
   lazy val unusedCompileDependenciesTask = Def.task {
     val log = streams.value.log
     val projectName = name.value
-    val allLibraryDeps = getAllLibraryDeps(compile.in(Compile).value.asInstanceOf[Analysis], log)
+    val csrCacheDirectoryValueOpt = csrCacheDirectoryValueTask.value
+    val allLibraryDeps = getAllLibraryDeps(compile.in(Compile).value.asInstanceOf[Analysis], log)(csrCacheDirectoryValueOpt)
     val libraryDeps = libraryDependencies.value
     val scalaBinaryVer = scalaBinaryVersion.value
     val filter = unusedCompileDependenciesFilter.value