Merge pull request #886 from dwijnand/fix-path-slash-failure-in-pickl…

…e-updates-jar Fix path slash failure in pickle updates jar
sbt · Aug 18, 2020 · 4bcd96a · 4bcd96a
2 parents 6078b60 + 637559c
commit 4bcd96a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala b/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala
@@ -143,9 +143,12 @@ final class MixedAnalyzingCompiler(
         val scalacOpts = pickleJarPair match {
           case Some((originalJar, updatesJar)) =>
             val path = originalJar.toString
+            // ^ Path#toString uses '\' on Windows
+            // but the path could've been specified with '/' in scalacOptions
+            val fwdSlashPath = path.replace('\\', '/')
             config.currentSetup.options.scalacOptions.map {
-              case s if s == path => updatesJar.toString
-              case s              => s
+              case s if s == path || s == fwdSlashPath => updatesJar.toString
+              case s                                   => s
             }
           case _ => config.currentSetup.options.scalacOptions
         }