diff --git a/build.sbt b/build.sbt index 9b1995c..46dac0b 100644 --- a/build.sbt +++ b/build.sbt @@ -30,13 +30,3 @@ lazy val cachecontrol = (project in file(".")) ) } ) - -addCommandAlias( - "validateCode", - List( - "headerCheckAll", - "scalafmtSbtCheck", - "scalafmtCheckAll", - "scalastyle", - ).mkString(";") -) diff --git a/common.sbt b/common.sbt new file mode 100644 index 0000000..d48fe3b --- /dev/null +++ b/common.sbt @@ -0,0 +1,26 @@ +// Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// NOTE: !!! THIS IS A COPY !!! // +// To edit this file use the main version in https://github.com/playframework/.github/blob/main/sbt/common.sbt // +///////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +addCommandAlias( + "formatCode", + List( + "headerCreateAll", + "scalafmtSbt", + "scalafmtAll", + "javafmtAll" + ).mkString(";") +) + +addCommandAlias( + "validateCode", + List( + "headerCheckAll", + "scalafmtSbtCheck", + "scalafmtCheckAll", + "javafmtCheckAll" + ).mkString(";") +) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0738853..9464135 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1") -addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1") +addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") diff --git a/scalastyle-config.xml b/scalastyle-config.xml deleted file mode 100644 index cd3e460..0000000 --- a/scalastyle-config.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - Scalastyle Typesafe configuration - - - - - - - - - - */]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -