From deaa7c1eb1162ef800232aadfc970f614102b01e Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Fri, 27 Oct 2023 13:37:07 +0900 Subject: [PATCH] avoid deprecated old sbt syntax (#1601) --- CONTRIBUTING.md | 2 +- build.sbt | 2 +- examples_and_formatting.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c3495e86f..9d88d7d44 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -71,7 +71,7 @@ Wrapping up your PR while working on this. Add the exclusions to `build.sbt`. Binary incompatibilities are expected when modifying `scalapb.proto` and in the meantime we have some tolerance for certain type of incompatabilities. -* In SBT, run `scalafmt` and `test:scalafmt` to ensure the code compiles +* In SBT, run `scalafmtAll` to ensure the code compiles cleanly. * Run `./make_plugin_proto.sh` to re-generate all the generated code that ships with ScalaPB. diff --git a/build.sbt b/build.sbt index 9deb82454..204f17aa1 100644 --- a/build.sbt +++ b/build.sbt @@ -17,7 +17,7 @@ inThisBuild( ) ) -addCommandAlias("fmt", "all scalafmtSbt scalafmt test:scalafmt") +addCommandAlias("fmt", "all scalafmtSbt scalafmtAll") lazy val sharedNativeSettings = List( nativeLinkStubs := true // for utest diff --git a/examples_and_formatting.sh b/examples_and_formatting.sh index cc99346f5..ecc2784ec 100755 --- a/examples_and_formatting.sh +++ b/examples_and_formatting.sh @@ -2,4 +2,4 @@ set -e ./test_generated_code_checked_in.sh for d in examples/*; do cd "$d" && sbt test && cd ../..; done -sbt -J-Xmx4500M scalafmtCheck test:scalafmtCheck scalafmtSbtCheck +sbt -J-Xmx4500M scalafmtCheckAll scalafmtSbtCheck