.

Author: lihaoyi

libs/javalib/src/mill/javalib/JavaModule.scala

@@ -1068,7 +1068,7 @@ trait JavaModule
         BoundDep(coursierDependencyTask(), force = false)
       ),
       sources = sources,
-      artifactTypes = Some(artifactTypes()),
+      artifactTypes = if (sources) None else Some(artifactTypes()),
       resolutionParamsMapOpt =
         Some { params =>
           params

libs/javalib/test/src/mill/javalib/ResolveDepsTests.scala

@@ -315,17 +315,49 @@ object ResolveDepsTests extends TestSuite {
 
     test("resolvedMvnDepsSources") {
       UnitTester(TestCase, null).scoped { eval =>
+        // First check that regular resolvedMvnDeps works
+        val Right(depsResult) = eval(TestCase.sources.resolvedMvnDeps): @unchecked
+        val deps = depsResult.value
+        assert(deps.nonEmpty)
+        assert(deps.exists(_.path.last.contains("geny")))
+
+        // Now check resolvedMvnDepsSources
         val Right(result) = eval(TestCase.sources.resolvedMvnDepsSources): @unchecked
         val sourcesDir = result.value.path
 
         // Check that the sources directory exists and contains unpacked source files
         assert(os.exists(sourcesDir))
         assert(os.isDir(sourcesDir))
 
-        // Check that geny source files are unpacked (geny has a Geny.scala file)
-        val scalaFiles = os.walk(sourcesDir).filter(_.ext == "scala")
-        assert(scalaFiles.nonEmpty)
-        assert(scalaFiles.exists(_.last == "Geny.scala"))
+        // Check that source files are unpacked
+        val allFiles = os
+          .walk(sourcesDir)
+          .filter(os.isFile)
+          .map(_.relativeTo(sourcesDir).toString)
+          .sorted
+
+        val expected = Set(
+          "geny/ByteData.scala",
+          "geny/Bytes.scala",
+          "geny/Generator.scala",
+          "geny/Internal.scala",
+          "geny/Writable.scala",
+          "rootdoc.txt",
+          "scala/AnyVal.scala",
+          "scala/AnyValCompanion.scala",
+          "scala/App.scala",
+          "scala/Array.scala",
+          "scala/Boolean.scala",
+          "scala/Byte.scala",
+          "scala/Char.scala",
+          "scala/Console.scala",
+          "scala/DelayedInit.scala",
+          "scala/Double.scala",
+          "scala/DummyImplicit.scala",
+          "scala/Dynamic.scala"
+        )
+
+        assert(expected.subsetOf(allFiles.toSet))
       }
     }
   }

libs/util/src/mill/util/JdkCommandsModule.scala

@@ -20,13 +20,14 @@ trait JdkCommandsModule extends mill.api.Module {
 
   private def callJdk(toolName: String, javaHome: Option[PathRef], args: Seq[String]): Int = {
     os.call(
-        cmd = Seq(jdkTool(toolName, javaHome.map(_.path))) ++ args,
-        stdin = os.Inherit,
-        stdout = os.Inherit,
-        check = false
-      )
+      cmd = Seq(jdkTool(toolName, javaHome.map(_.path))) ++ args,
+      stdin = os.Inherit,
+      stdout = os.Inherit,
+      check = false
+    )
       .exitCode
   }
+
   /**
    * Runs the `java` command from this module's [[jdkCommandsJavaHome]].
    * Renamed to `java` on the command line.