From 63cd8f53c6a11c16ed9eadfc2e5f3ba76710f559 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Mon, 22 Jun 2020 12:56:14 -0700 Subject: [PATCH] Use real paths for zinc base path The AppConfiguration.baseDirectory is dealiased during project loading. Not dealiasing the symlink here could cause a discrepancy between the `baseDirectory` key and the value of the base key in the root paths map. --- main/src/main/scala/sbt/Defaults.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index d52fe15c3..79810a9fe 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -191,7 +191,7 @@ object Defaults extends BuildCommon { allowMachinePath :== true, rootPaths := { val app = appConfiguration.value - val base = app.baseDirectory + val base = app.baseDirectory.getCanonicalFile val boot = app.provider.scalaProvider.launcher.bootDirectory val ih = app.provider.scalaProvider.launcher.ivyHome val coursierCache = csrCacheDirectory.value