Fix scripted tests (#3)

coralogix · Oct 25, 2024 · 4d39be6 · 4d39be6
1 parent f4331de
commit 4d39be6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
-addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
+addSbtPlugin("org.scalameta"     % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("de.heikoseeberger" % "sbt-header"   % "5.10.0")
diff --git a/sbt-protofetch/src/main/scala/com/coralogix/sbtprotofetch/ProtofetchBinary.scala b/sbt-protofetch/src/main/scala/com/coralogix/sbtprotofetch/ProtofetchBinary.scala
@@ -29,7 +29,7 @@ import java.util
 
 object ProtofetchBinary {
 
-  val DEFAULT_VERSION = "0.1.1"
+  val DEFAULT_VERSION = "0.1.8"
 
   def download(
       logger: Logger,

diff --git a/sbt-protofetch/src/main/scala/com/coralogix/sbtprotofetch/ProtofetchPlugin.scala b/sbt-protofetch/src/main/scala/com/coralogix/sbtprotofetch/ProtofetchPlugin.scala
@@ -55,11 +55,12 @@ object ProtofetchPlugin extends AutoPlugin {
   )
 
   override lazy val projectSettings: Seq[Setting[_]] = Seq(
-    protofetchModuleFile := baseDirectory.value / "protofetch.toml",
+    protofetchModuleFile            := baseDirectory.value / "protofetch.toml",
+    protofetchFetch / baseDirectory := protofetchModuleFile.value.getParentFile,
     protofetchLockFile := protofetchModuleFile.value.getParentFile / "protofetch.lock",
     protofetchOutputDirectory := {
-      val moduleFile = protofetchModuleFile.value
-      moduleFile.getParentFile / Protofetch.getOutputDirectory(moduleFile)
+      (protofetchFetch / baseDirectory).value /
+        Protofetch.getOutputDirectory(protofetchModuleFile.value)
     },
     protofetchFetch / insideCI := insideCI.value,
     protofetchFetch := {
@@ -69,14 +70,15 @@ object ProtofetchPlugin extends AutoPlugin {
       val s              = streams.value
       val binaryFileInfo = FileInfo.lastModified(protofetchBinary.value)
       val moduleFileInfo = FileInfo.hash(protofetchModuleFile.value)
+      val base           = (protofetchFetch / baseDirectory).value;
       val lockFile       = protofetchLockFile.value
       val locked         = (protofetchFetch / insideCI).value
 
       val tracked = Tracked.outputChangedW(s.cacheStoreFactory.make("fetch"))({
         (changed, _: (Inputs, Outputs)) =>
           if (changed) {
             Protofetch.fetch(
-              baseDirectory.value,
+              base,
               s.log,
               binaryFileInfo.file,
               moduleFileInfo.file,