From a088169568809317367b5414d8032ae38c9a71e6 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 25 Aug 2017 17:14:41 -0400 Subject: [PATCH] Don't format *.sbt files This adds update on load, which interacts badly with +compile. --- .travis.yml | 2 +- build.sbt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1af85e971..3287be692 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ scala: - 2.12.3 script: - - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "++$TRAVIS_SCALA_VERSION" mimaReportBinaryIssues scalafmt::test test:scalafmt::test sbt:scalafmt::test test + - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "++$TRAVIS_SCALA_VERSION" mimaReportBinaryIssues scalafmt::test test:scalafmt::test test cache: directories: diff --git a/build.sbt b/build.sbt index 75189bece..8ddde2f78 100644 --- a/build.sbt +++ b/build.sbt @@ -63,6 +63,7 @@ lazy val utilRoot: Project = (project in file(".")) description := "Util module for sbt", scmInfo := Some(ScmInfo(url("https://github.com/sbt/util"), "git@github.com:sbt/util.git")), scalafmtOnCompile := true, + scalafmtOnCompile in Sbt := false, scalafmtVersion := "1.2.0", )), commonSettings,