Merge pull request #582 from romanowski/fix-master

Replace .scala remining .scala directories

Author: romanowski

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

@@ -310,7 +310,7 @@ abstract class CompileTestDefinitions(val scalaVersionOpt: Option[String])
       os.proc(TestUtil.cli, "compile", extraOptions, javaSemDbOptions, ".")
         .call(cwd = root)
 
-      val files = os.walk(root / ".scala")
+      val files = os.walk(root / Constants.workspaceDirName)
       val semDbFiles = files
         .filter(_.last.endsWith(".semanticdb"))
         .filter(!_.segments.exists(_ == "bloop-internal-classes"))
@@ -340,7 +340,7 @@ abstract class CompileTestDefinitions(val scalaVersionOpt: Option[String])
       os.proc(TestUtil.cli, "compile", extraOptions, "--semantic-db", ".")
         .call(cwd = root)
 
-      val files = os.walk(root / ".scala")
+      val files = os.walk(root / Constants.workspaceDirName)
       val semDbFiles = files
         .filter(_.last.endsWith(".semanticdb"))
         .filter(!_.segments.exists(_ == "bloop-internal-classes"))

sclicheck/sclicheck.scala

@@ -163,7 +163,7 @@ def checkFile(file: os.Path, options: Options): Unit =
 
     cmd match
       case Commands.Run(cmds, shouldFail, _) =>
-        val script = out / ".scala" / "run.sh"
+        val script = out / ".scala-build" / "run.sh"
         os.write.over(script, mkBashScript(cmds), createFolders = true)
         os.perms.set(script, "rwxr-xr-x")
         val res = os.proc(script).call(cwd = out, mergeErrIntoOut = true, check = false)