Allow multiline config; standardise on one default config (#11)

Author: mwz

.github/workflows/test.yml

@@ -18,12 +18,14 @@ jobs:
         with:
           path: ~/.ivy2/cache
           key: ivy-${{hashFiles('**/*.sbt')}}
-          restore-keys: |
-            ivy-
+          restore-keys: ivy-
       - uses: actions/cache@v1
         with:
           path: ~/.sbt
           key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}}
-          restore-keys: |
-            sbt-
+          restore-keys: sbt-
       - run: sbt +test
+      - name: Run scalastyle using a snapshot version
+        run: |
+          sbt 'set version := "99-SNAPSHOT"; ++2.12.10; publishLocal'
+          sbt -Dscalastyle.version=99-SNAPSHOT scalastyle

.gitignore

@@ -10,7 +10,9 @@ target
 .classpath
 .project
 .settings
-/bin
-/project/
-.bloop/
-.metals/
+bin
+project/project
+
+.bloop
+.metals
+metals.sbt

.scalafix.conf

@@ -4,7 +4,6 @@ LeakingImplicitClassVal,
 NoAutoTupling,
 NoValInForComprehension,
 ProcedureSyntax,
-SortImports,
 RemoveUnused
 ]
 

.scalastyle

@@ -1,4 +1,5 @@
 import sbt._
+import sbt.Keys.streams
 
 enablePlugins(BuildInfoPlugin)
 
@@ -83,8 +84,10 @@ scalafixDependencies in ThisBuild ++= Seq(
   "org.scala-lang.modules" %% "scala-collection-migrations" % "2.1.3",
   "com.nequissimus"        %% "sort-imports"                % "0.3.1"
 )
-addCommandAlias("fix", "all compile:scalafix test:scalafix")
-addCommandAlias("fixCheck", ";compile:scalafix --check ;test:scalafix --check")
+addCommandAlias("fix", "all compile:scalafix test:scalafix; fixImports")
+addCommandAlias("fixImports", "compile:scalafix SortImports; test:scalafix SortImports")
+addCommandAlias("fixCheck", "compile:scalafix --check; test:scalafix --check; fixCheckImports")
+addCommandAlias("fixCheckImports", "compile:scalafix --check SortImports; test:scalafix --check SortImports")
 scalafmtOnCompile in ThisBuild :=
   sys.env
     .get("CI")

build.sbt

@@ -0,0 +1,4 @@
+val scalastyleVersion = settingKey[String]("Scalastyle version")
+scalastyleVersion := sys.props.getOrElse("scalastyle.version", "1.1.1")
+
+libraryDependencies += "com.beautiful-scala" %% "scalastyle" % scalastyleVersion.value

lib/scalastyle_config.xml

@@ -1,6 +1,7 @@
-addSbtPlugin("com.eed3si9n"  % "sbt-assembly"   % "0.14.10")
-addSbtPlugin("com.eed3si9n"  % "sbt-buildinfo"  % "0.9.0")
-addSbtPlugin("com.geirsson"  % "sbt-ci-release" % "1.5.2")
-addSbtPlugin("org.scoverage" % "sbt-scoverage"  % "1.6.1")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix"   % "0.9.11")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt"   % "2.3.1")
+addSbtPlugin("com.eed3si9n"        % "sbt-assembly"   % "0.14.10")
+addSbtPlugin("com.eed3si9n"        % "sbt-buildinfo"  % "0.9.0")
+addSbtPlugin("com.geirsson"        % "sbt-ci-release" % "1.5.2")
+addSbtPlugin("org.scoverage"       % "sbt-scoverage"  % "1.6.1")
+addSbtPlugin("ch.epfl.scala"       % "sbt-scalafix"   % "0.9.11")
+addSbtPlugin("org.scalameta"       % "sbt-scalafmt"   % "2.3.1")
+addSbtPlugin("com.beautiful-scala" % "sbt-scalastyle" % "1.1.0")

lib/scalastyle_scala_config.xml

@@ -0,0 +1 @@
+src/main/resources/default_config.xml