Merge pull request #136 from sbt/revert-133-sbt1

Revert "sbt 1.0.0-RC2"

.travis.yml

@@ -6,9 +6,7 @@ scala:
   - 2.12.2
 
 script:
-# drop scalafmt on the 1.0.0 branch to dogfood 1.0.0-RC2 before there is a sbt 1.0 of new-sbt-scalafnt
-# - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M ";++$TRAVIS_SCALA_VERSION test;scalafmt::test;test:scalafmt::test"
-  - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M ";++$TRAVIS_SCALA_VERSION test"
+  - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M ";++$TRAVIS_SCALA_VERSION test;scalafmt::test;test:scalafmt::test"
 
 cache:
   directories:

build.sbt

@@ -41,9 +41,9 @@ lazy val lmRoot = (project in file("."))
           url("https://github.com/sbt/librarymanagement"), "git@github.com:sbt/librarymanagement.git"
         )),
         bintrayPackage := "librarymanagement",
-        // scalafmtOnCompile := true,
+        scalafmtOnCompile := true,
         // scalafmtVersion 1.0.0-RC3 has regression
-        // scalafmtVersion := "0.6.8",
+        scalafmtVersion := "0.6.8",
         git.baseVersion := baseVersion,
         version := {
           val v = version.value

project/build.properties

@@ -1 +1 @@
-sbt.version=1.0.0-RC2
+sbt.version=1.0.0-M6

project/plugins.sbt

@@ -1,6 +1,6 @@
 addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.3")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.0-M9")
-
-// addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.3")
+addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.4.0")
+addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.3")
 
 scalacOptions += "-language:postfixOps"