Update to the latest sbt-scalafmt (#39)

* Move from source folders with dots

* Update to the latest scalafmt sbt plugin

* Reformat build code

* Reformat code

* Check formatting for all code in Travis

* Migrate to travis-ci.com

* Fix travis configuration

Author: 2m

.scalafmt.conf

@@ -1,3 +1,5 @@
+version = 2.0.0-RC8
+
 maxColumn = 120
 docstrings = JavaDoc
 assumeStandardLibraryStripMargin = true

.travis.yml

@@ -4,15 +4,21 @@ scala: 2.12.8
 
 jobs:
   include:
+    - stage: check
+      script: sbt scalafmtCheckAll || { echo "[error] Unformatted code found. Please run 'scalafmtAll' and commit the reformatted code."; false; }
+      name: Code style check (fixed with `sbt scalafmtAll`)
+    - script: sbt scalafmtSbtCheck || { echo "[error] Unformatted sbt code found. Please run 'scalafmtSbt' and commit the reformatted code."; false; }
+      name: Build code style check (fixed with `sbt scalafmtSbt`)
     - stage: test
-      script: sbt scalafmtCheck scalafmtSbtCheck
-      name: "Formatting check"
-    - script: sbt test
-      name: "Tests run"
+      script: sbt test
+      name: Tests run
     - stage: publish
       script: sbt ^publish
+      name: Publish artifacts
 
 stages:
+  - name: check # runs on master commits and PRs
+    if: NOT tag =~ ^v
   - name: test # runs on master commits and PRs
     if: NOT tag =~ ^v
   - name: publish # runs on main repo master commits or version-tagged commits

README.md

@@ -2,8 +2,8 @@
 
 [bintray]:               https://bintray.com/sbt/sbt-plugin-releases/sbt-paradox-apidoc
 [bintray-badge]:         https://api.bintray.com/packages/sbt/sbt-plugin-releases/sbt-paradox-apidoc/images/download.svg
-[travis]:                https://travis-ci.org/lightbend/sbt-paradox-apidoc
-[travis-badge]:          https://travis-ci.org/lightbend/sbt-paradox-apidoc.svg?branch=master
+[travis]:                https://travis-ci.com/lightbend/sbt-paradox-apidoc
+[travis-badge]:          https://travis-ci.com/lightbend/sbt-paradox-apidoc.svg?branch=master
 
 A [paradox](https://github.com/lightbend/paradox/) directive that automatically adds links for classes from documentation to scaladoc and javadoc.
 

build.sbt

@@ -15,11 +15,14 @@ libraryDependencies ++= Seq(
 licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0"))
 homepage := Some(url("https://github.com/lightbend/sbt-paradox-apidoc"))
 scmInfo := Some(
-  ScmInfo(url("https://github.com/lightbend/sbt-paradox-apidoc"), "git@github.com:lightbend/sbt-paradox-apidoc.git"))
-developers += Developer("contributors",
-                        "Contributors",
-                        "https://gitter.im/lightbend/paradox",
-                        url("https://github.com/lightbend/sbt-paradox-apidoc/graphs/contributors"))
+  ScmInfo(url("https://github.com/lightbend/sbt-paradox-apidoc"), "git@github.com:lightbend/sbt-paradox-apidoc.git")
+)
+developers += Developer(
+  "contributors",
+  "Contributors",
+  "https://gitter.im/lightbend/paradox",
+  url("https://github.com/lightbend/sbt-paradox-apidoc/graphs/contributors")
+)
 organizationName := "Lightbend Inc."
 startYear        := Some(2018)
 

project/plugins.sbt

@@ -1,4 +1,4 @@
 addSbtPlugin("com.dwijnand"      % "sbt-dynver"   % "3.3.0")
 addSbtPlugin("org.foundweekends" % "sbt-bintray"  % "0.5.5")
 addSbtPlugin("de.heikoseeberger" % "sbt-header"   % "5.2.0")
-addSbtPlugin("com.geirsson"      % "sbt-scalafmt" % "1.5.1")
+addSbtPlugin("org.scalameta"     % "sbt-scalafmt" % "2.0.1")

src/main/scala/com/lightbend/paradox/apidoc/ApidocDirective.scala

@@ -84,21 +84,25 @@ class ApidocDirective(allClassesAndObjects: IndexedSeq[String]) extends InlineDi
       null,
       attributes,
       null,
-      new DirectiveNode(DirectiveNode.Format.Inline,
-                        group + "doc",
-                        label,
-                        syntheticSource,
-                        node.attributes,
-                        fqcn,
-                        new TextNode(label))
+      new DirectiveNode(
+        DirectiveNode.Format.Inline,
+        group + "doc",
+        label,
+        syntheticSource,
+        node.attributes,
+        fqcn,
+        new TextNode(label)
+      )
     )
   }
 
-  def renderMatches(query: Query,
-                    matches: Seq[String],
-                    node: DirectiveNode,
-                    visitor: Visitor,
-                    printer: Printer): Unit = {
+  def renderMatches(
+      query: Query,
+      matches: Seq[String],
+      node: DirectiveNode,
+      visitor: Visitor,
+      printer: Printer
+  ): Unit = {
     val scalaClassSuffix = if (query.linkToObject) "$" else ""
 
     matches.size match {
@@ -119,7 +123,7 @@ class ApidocDirective(allClassesAndObjects: IndexedSeq[String]) extends InlineDi
       case n =>
         throw new java.lang.IllegalStateException(
           s"$n matches found for $query, but not javadsl/scaladsl: ${matches.mkString(", ")}. " +
-            s"You may want to use the fully qualified class name as @apidoc[fqcn] instead of @apidoc[$query]."
+              s"You may want to use the fully qualified class name as @apidoc[fqcn] instead of @apidoc[$query]."
         )
     }
   }

src/main/scala/com/lightbend/paradox/apidoc/ApidocPlugin.scala

@@ -40,26 +40,27 @@ object ApidocPlugin extends AutoPlugin {
   def apidocParadoxGlobalSettings: Seq[Setting[_]] = Seq(
     apidocRootPackage := "scala",
     paradoxDirectives ++= Def.taskDyn {
-      val classpath   = (fullClasspath in Compile).value.files.map(_.toURI.toURL).toArray
-      val classLoader = new java.net.URLClassLoader(classpath, this.getClass.getClassLoader)
-      val scanner = new ClassGraph()
-        .whitelistPackages(apidocRootPackage.value)
-        .addClassLoader(classLoader)
-        .scan()
-      val allClasses = scanner.getAllClasses.getNames.asScala.toVector
-      Def.task {
-        Seq(
-          { _: Writer.Context ⇒
-            new ApidocDirective(allClasses)
+          val classpath   = (fullClasspath in Compile).value.files.map(_.toURI.toURL).toArray
+          val classLoader = new java.net.URLClassLoader(classpath, this.getClass.getClassLoader)
+          val scanner = new ClassGraph()
+            .whitelistPackages(apidocRootPackage.value)
+            .addClassLoader(classLoader)
+            .scan()
+          val allClasses = scanner.getAllClasses.getNames.asScala.toVector
+          Def.task {
+            Seq(
+              { _: Writer.Context ⇒
+                new ApidocDirective(allClasses)
+              }
+            )
           }
-        )
-      }
-    }.value
+        }.value
   )
 
   def apidocSettings(config: Configuration): Seq[Setting[_]] =
     apidocParadoxGlobalSettings ++ inConfig(config)(
-      Seq(
-        // scoped settings here
-      ))
+          Seq(
+            // scoped settings here
+          )
+        )
 }