From b977f26cae0b925bf6e09a1ab871bc18eea6483e Mon Sep 17 00:00:00 2001
From: Adrien Piquerez <adrien.piquerez@gmail.com>
Date: Wed, 3 Jul 2024 14:47:57 +0200
Subject: [PATCH] Fix analysis of Java compilation to jar

---
 .../scala/sbt/internal/inc/MixedAnalyzingCompiler.scala    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala b/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala
index 390656bb9..81ed0f88f 100644
--- a/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala
+++ b/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala
@@ -70,7 +70,8 @@ final class MixedAnalyzingCompiler(
 
         def toVirtualFile(p: Path) = config.converter.toVirtualFile(p.toAbsolutePath)
 
-        JarUtils.getOutputJar(output) match {
+        val outputJarOpt = JarUtils.getOutputJar(output)
+        outputJarOpt match {
           case Some(outputJar) if !javac.supportsDirectToJar =>
             val outputDir = JarUtils.javacTempOutput(outputJar)
             Files.createDirectories(outputDir)
@@ -80,7 +81,7 @@ final class MixedAnalyzingCompiler(
               config.converter,
               joptions,
               CompileOutput(outputDir),
-              Some(outputJar),
+              outputJarOpt,
               callback,
               incToolOptions,
               config.reporter,
@@ -96,7 +97,7 @@ final class MixedAnalyzingCompiler(
                 config.converter,
                 joptions,
                 output,
-                None,
+                outputJarOpt,
                 callback,
                 incToolOptions,
                 config.reporter,