Merge pull request #344 from ckipp01/scalafmt

Add in Scalafmt

Author: ckipp01

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 jobs:
-  scala:
+  test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -27,5 +27,23 @@ jobs:
           distribution: 'adopt'
           java-version: ${{ matrix.java }}
 
-      - name: run tests
+      - name: Run tests
         run: sbt scripted
+
+  formatting:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: checkout the repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up JVM
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '8'
+
+      - name: Check Formatting
+        run: sbt scalafmtCheckAll

.scalafmt.conf

@@ -0,0 +1 @@
+version = "2.7.5"

build.sbt

@@ -2,7 +2,6 @@ name := "sbt-scoverage"
 
 import sbt.ScriptedPlugin.autoImport.scriptedLaunchOpts
 
-def isCI = System.getenv("CI") != null
 def scoverageVersion = "1.4.5"
 
 inThisBuild(
@@ -35,7 +34,7 @@ lazy val root = Project("sbt-scoverage", file("."))
   .settings(
     libraryDependencies ++= Seq(
       "org.scala-lang" % "scala-compiler" % scalaVersion.value % Compile,
-      "org.scoverage" %% "scalac-scoverage-plugin" % scoverageVersion cross (CrossVersion.full),
+      "org.scoverage" %% "scalac-scoverage-plugin" % scoverageVersion cross (CrossVersion.full)
     ),
     buildInfoKeys := Seq[BuildInfoKey]("scoverageVersion" -> scoverageVersion),
     buildInfoPackage := "scoverage",

project/plugins.sbt

@@ -1,3 +1,4 @@
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")

src/main/scala/scoverage/ScoverageKeys.scala

@@ -3,7 +3,10 @@ package scoverage
 import sbt._
 
 object ScoverageKeys {
-  lazy val coverageEnabled = settingKey[Boolean]("controls whether code instrumentation is enabled or not")
+  // format: off
+  lazy val coverageEnabled = settingKey[Boolean](
+    "controls whether code instrumentation is enabled or not"
+  )
   lazy val coverageReport = taskKey[Unit]("run report generation")
   lazy val coverageAggregate = taskKey[Unit]("aggregate reports from subprojects")
   lazy val coverageExcludedPackages = settingKey[String]("regex for excluded packages")
@@ -17,4 +20,5 @@ object ScoverageKeys {
   lazy val coverageOutputDebug = settingKey[Boolean]("turn on the debug report")
   lazy val coverageOutputTeamCity = settingKey[Boolean]("turn on teamcity reporting")
   lazy val coverageScalacPluginVersion = settingKey[String]("version of scalac-scoverage-plugin to use")
+  // format: on
 }