Skip to content
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.

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

avoid deprecated old sbt syntax #1601

Merged
merged 1 commit into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples_and_formatting.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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