Use .scala as workspace

MaciejG604 · Jul 8, 2021 · 46830ae · 46830ae
1 parent 3f13421
commit 46830ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/build/src/main/scala/scala/build/Build.scala b/modules/build/src/main/scala/scala/build/Build.scala
@@ -326,7 +326,7 @@ object Build {
     )
 
     val project = Project(
-               workspace = inputs.workspace,
+               workspace = inputs.workspace / ".scala",
               classesDir = classesDir0,
            scalaCompiler = scalaCompiler,
           scalaJsOptions = options.scalaJsOptions.config,

diff --git a/modules/build/src/main/scala/scala/build/Project.scala b/modules/build/src/main/scala/scala/build/Project.scala
@@ -33,7 +33,7 @@ final case class Project(
     baseBloopProject(
       projectName,
       workspace.toNIO,
-      (workspace / ".scala" / ".bloop" / projectName).toNIO,
+      (workspace / ".bloop" / projectName).toNIO,
       classesDir.toNIO
     )
     .copy(
@@ -52,7 +52,7 @@ final case class Project(
 
   def writeBloopFile(logger: Logger): Boolean = {
     val bloopFileContent = writeAsJsonToArray(bloopFile)(BloopCodecs.codecFile)
-    val dest = workspace / ".scala" / ".bloop" / s"$projectName.json"
+    val dest = workspace / ".bloop" / s"$projectName.json"
     val doWrite = !os.isFile(dest) || {
       val currentContent = os.read.bytes(dest)
       !Arrays.equals(currentContent, bloopFileContent)