Skip to content

Update scalafmt worker to be compatible with Scala 3 #1354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 11, 2022
Merged

Update scalafmt worker to be compatible with Scala 3 #1354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7434283
Update scalafmt worker to be compatible with Scala 3
liucijus Feb 11, 2022
2e0ac68
Fix condition
liucijus Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions scala/scalafmt/scalafmt/ScalafmtWorker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ import org.scalafmt.Scalafmt
import org.scalafmt.config.Config
import org.scalafmt.util.FileOps
import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.io.Codec

object ScalafmtWorker extends Worker.Interface {

def main(args: Array[String]): Unit = Worker.workerMain(args, ScalafmtWorker)

def work(args: Array[String]) {
def work(args: Array[String]): Unit = {
val argName = List("config", "input", "output")
val argFile = args.map{x => new File(x)}
val namespace = argName.zip(argFile).toMap
Expand Down
2 changes: 1 addition & 1 deletion scala/scalafmt/scalafmt_repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def scalafmt_repositories(
"com_geirsson_metaconfig_core",
"com_geirsson_metaconfig_typesafe_config",
]
if SCALA_MAJOR_VERSION == "2.13":
if SCALA_MAJOR_VERSION == "2.13" or SCALA_MAJOR_VERSION == "3.1":
artifact_ids.append("io_bazel_rules_scala_scala_parallel_collections")

repositories(
Expand Down