Merge pull request #2 from openlawteam/bump-scalafmt-native

bump scalafmt-native

.github/testdata/Good.scala

@@ -3,7 +3,6 @@ messiness added to it. -mroth */
 package org.scalafmt
 
 sealed abstract class Formatted {
-
   def toEither: Either[Throwable, String] = this match {
     case Formatted.Success(s) => Right(s)
     case Formatted.Failure(e) => Left(e) // too much space before comment

Dockerfile

@@ -1,6 +1,6 @@
 # This is essentially just scalafmt-native loaded into an alpine container, so
 # that we have a shell present to expand wildcards etc.
-FROM mrothy/scalafmt-native:2.0.1 as scalafmt-native
+FROM mrothy/scalafmt-native:2.2.2 as scalafmt-native
 
 FROM alpine:latest
 LABEL "repository"="https://github.com/openlawteam/scalafmt-ci"

Makefile

@@ -11,21 +11,22 @@ image:
 test:
 	docker run --rm -it \
 		-w=$(WORKDIR) \
-		-v "$$(pwd)/.github/testdata":$(WORKDIR) \
+		-v "$$(pwd)/$(TESTDATA)":$(WORKDIR) \
 		$(IMAGE) --list --exclude Bad.scala
 
 # expected failure, to see output
 testfail: 
 	docker run --rm -it \
 		-w=$(WORKDIR) \
-		-v "$$(pwd)/.github/testdata":$(WORKDIR) \
+		-v "$$(pwd)/$(TESTDATA)":$(WORKDIR) \
 		$(IMAGE) --list
 
 # generate the "good" version of the sample file
 $(TESTDATA)/Good.scala: $(TESTDATA)/Bad.scala $(TESTDATA)/.scalafmt.conf
 	docker run --rm -i \
-		mrothy/scalafmt-native \
-			--config $(TESTDATA)/.scalafmt.conf \
+		-v "$$(pwd)/$(TESTDATA)":/conf \
+		mrothy/scalafmt-native:2.2.2 \
+			--config /conf/.scalafmt.conf \
 			--stdin --stdout \
 	< $< > $@