From 46830ae9e784615988d59e9b143d1ec7bf57b382 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 22 Jun 2021 19:01:32 +0200 Subject: [PATCH] Use .scala as workspace --- modules/build/src/main/scala/scala/build/Build.scala | 2 +- modules/build/src/main/scala/scala/build/Project.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/build/src/main/scala/scala/build/Build.scala b/modules/build/src/main/scala/scala/build/Build.scala index 6e4862ee49..55d438984e 100644 --- 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 index 98ad1ddb5b..7831dccaa7 100644 --- 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)