Revert adding options from sources to module hash as it's unnecessary and complicates the build process in compose mode.

Author: MaciejG604

modules/build/src/main/scala/scala/build/Build.scala

@@ -280,6 +280,11 @@ object Build {
 
       val baseOptions = overrideOptions.orElse(sharedOptions)
 
+      val inputs0 = updateInputs(
+        inputs,
+        overrideOptions.orElse(options) // update hash in inputs with options coming from the CLI or cross-building, not from the sources
+      )
+
       val scopedSources = value(crossSources.scopedSources(baseOptions))
 
       val mainSources =
@@ -290,12 +295,6 @@ object Build {
         value(scopedSources.sources(Scope.Test, baseOptions, inputs.workspace, logger))
       val testOptions = testSources.buildOptions
 
-      val inputs0 = updateInputs(
-        inputs,
-        mainOptions, // update hash in inputs with options coming from the CLI or cross-building, not from the sources
-        Some(testOptions).filter(_ != mainOptions)
-      )
-
       def doBuildScope(
         options: BuildOptions,
         sources: Sources,

modules/integration/src/test/scala/scala/cli/integration/CompileTestDefinitions.scala

@@ -183,16 +183,7 @@ abstract class CompileTestDefinitions
 
   test("no arg") {
     simpleInputs.fromRoot { root =>
-      val projectFilePrefix = root.baseName + "_"
       os.proc(TestUtil.cli, "compile", extraOptions, ".").call(cwd = root)
-      val projDirs = os.list(root / Constants.workspaceDirName)
-        .filter(_.last.startsWith(projectFilePrefix))
-        .filter(os.isDir(_))
-      expect(projDirs.length == 1)
-      val projDir     = projDirs.head
-      val projDirName = projDir.last
-      val elems       = projDirName.stripPrefix(projectFilePrefix).split("[-_]").toSeq
-      expect(elems.length == 1)
     }
   }
 
@@ -254,18 +245,6 @@ abstract class CompileTestDefinitions
         )
       expect(isDefinedTestPathInClassPath)
       checkIfCompileOutputIsCopied("Tests", tempOutput)
-
-      val projectFilePrefix = root.baseName + "_"
-
-      val projDirs = os.list(root / Constants.workspaceDirName)
-        .filter(_.last.startsWith(projectFilePrefix))
-        .filter(os.isDir(_))
-      expect(projDirs.length == 1)
-      val projDir     = projDirs.head
-      val projDirName = projDir.last
-      val elems       = projDirName.stripPrefix(projectFilePrefix).split("[-_]").toSeq
-      expect(elems.length == 2)
-      expect(elems.toSet.size == 2)
     }
   }