scalafmt

Author: MasseGuillaume

.gitignore

@@ -13,3 +13,5 @@ target/
 /bin/
 /.cache-main
 /.cache-tests
+admin/.coursier
+admin/.scalafmt*

.scalafmt.conf

@@ -0,0 +1,15 @@
+align = more
+docstrings = JavaDoc
+assumeStandardLibraryStripMargin = true
+project.git = true
+maxColumn = 100
+project.excludeFilters = [
+  "scalafix/input/"
+  "scalafix/output/"
+  "scalafix/output212/"
+  "scalafix/output212\\+/"
+  "scalafix/output213/"
+  "scalafix/output213-failure/"
+]
+
+

.travis.yml

@@ -59,6 +59,11 @@ matrix:
       scala: 2.12.6
       env: TEST_BINARY_COMPAT=true
 
+    # run scalafmt
+    - jdk: oraclejdk8
+      scala: 2.12.6
+      env: TEST_SCALAFMT=true
+
 # | jdk         |   scala   | scala target | scala target version | scalafix test |
 # | ----------- | --------- | ------------ | -------------------- |---------------|
 # |    openjdk6 | 2.11.12   | jvm          |                      |               |

CONTRIBUTING.md

@@ -53,7 +53,9 @@ class ToIteratorVsIteratorSrc(xs: Iterable[Int]) {
     - run sbt
       and then run the following task `compile`;
 
-5. Commit your changes, push your branch to your fork and create a pull request.
+5. Format your code with the `scalafmt` sbt task.
+
+6. Commit your changes, push your branch to your fork and create a pull request.
 
 Then maybe someone will take over and implement your use case… or maybe you will
 (see next section)!

admin/scalafmt.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# set -x
+
+HERE="`dirname $0`"
+VERSION="1.5.1"
+COURSIER="$HERE/.coursier"
+SCALAFMT="$HERE/.scalafmt-$VERSION"
+
+if [ ! -f $COURSIER ]; then
+  curl -L -o $COURSIER https://git.io/vgvpD
+  chmod +x $COURSIER
+fi
+
+if [ ! -f $SCALAFMT ]; then
+  $COURSIER bootstrap com.geirsson:scalafmt-cli_2.11:$VERSION --main org.scalafmt.cli.Cli -o $SCALAFMT
+  chmod +x $SCALAFMT
+fi
+
+$SCALAFMT "$@"

binary-compat/test/src/test/scala/BinaryCompaTest.scala

@@ -9,7 +9,7 @@ class BinaryCompaTest {
   @Test
   def compat(): Unit = {
     Config.setup("foo", Array(oldClasspath, newClasspath))
-    val mima = new MiMaLib(Config.baseClassPath)
+    val mima        = new MiMaLib(Config.baseClassPath)
     val allProblems = mima.collectProblems(oldClasspath, newClasspath)
     Assert.assertEquals(allProblems, Nil)
   }