Skip to content

Commit

Permalink
Merge pull request #645 from romanowski/fix-fix
Browse files Browse the repository at this point in the history
Fix 'fix' task in our build on MacOS
  • Loading branch information
romanowski committed Feb 9, 2022
2 parents 1ea234e + 97d2f23 commit 0d5d1d5
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions project/settings.sc
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,8 @@ trait ScalaCliCompile extends ScalaModule {

val proc = os.proc(
Seq("scala-cli", "compile", "--classpath"),
if (scalaVersion().startsWith("3")) Nil
else Seq("-O", s"-P:semanticdb:sourceroot:${os.pwd}"),
Seq("-S", scalaVersion()),
asOpt(scalacOptions(), "-O"),
asOpt(compileClasspath().map(_.path), "--jar"),
Expand All @@ -731,6 +733,7 @@ trait ScalaCliCompile extends ScalaModule {

val compile = proc.call()
val out = compile.out.trim

os.Path(out.split(File.pathSeparator).head)
}

Expand Down

0 comments on commit 0d5d1d5

Please sign in to comment.