Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
SPARK-30570 scalafmt 1.0.3 onlyChangedFiles appears to work correctly…
… on scala 2.12
  • Loading branch information
koeninger committed Jan 19, 2020
commit be9dc369c92be2599f51e33fbdf9ea7f2db1d567
5 changes: 1 addition & 4 deletions dev/scalafmt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,4 @@
# limitations under the License.
#

# by default, format only files that differ from git master
params="${@:---diff}"

./build/mvn -Pscala-2.12 mvn-scalafmt_2.12:format -Dscalafmt.skip=false -Dscalafmt.parameters="$params"
./build/mvn -Pscala-2.12 mvn-scalafmt_2.12:format -Dscalafmt.skip=false
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
<commons.collections.version>3.2.2</commons.collections.version>
<scala.version>2.12.10</scala.version>
<scala.binary.version>2.12</scala.binary.version>
<scalafmt.parameters>--diff --test</scalafmt.parameters>
<scalafmt.parameters>--test</scalafmt.parameters>
<!-- for now, not running scalafmt as part of default verify pipeline -->
<scalafmt.skip>true</scalafmt.skip>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
Expand Down Expand Up @@ -3031,13 +3031,14 @@
<plugin>
<groupId>org.antipathy</groupId>
<artifactId>mvn-scalafmt_2.12</artifactId>
<version>0.12_1.5.1</version>
<version>1.0.3</version>
<configuration>
<parameters>${scalafmt.parameters}</parameters> <!-- (Optional) Additional command line arguments -->
<skip>${scalafmt.skip}</skip> <!-- (Optional) skip formatting -->
<skipSources>${scalafmt.skip}</skipSources>
<skipTestSources>${scalafmt.skip}</skipTestSources>
<configLocation>dev/.scalafmt.conf</configLocation> <!-- (Optional) config location -->
<onlyChangedFiles>true</onlyChangedFiles>
</configuration>
<executions>
<execution>
Expand Down