From 70805527accc5e40794dad8e775a279d8d331f4b Mon Sep 17 00:00:00 2001 From: karma4u101 Date: Sun, 2 Oct 2016 20:19:27 +0200 Subject: [PATCH] Prep for v1.7 release. --- build.sbt | 2 +- project/autobuildscript/build-publish-Lift26.txt | 2 +- project/autobuildscript/build-publish-Lift3.txt | 2 +- project/scalafmt.sbt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 5c7e9d7a..db14059b 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ lazy val commonSettings = Seq( lazy val fobometa = (project in file(".")) .settings(commonSettings: _*) .settings(unidocSettings: _*) - .settings(scalafmtConfig in ThisBuild := Some(file(".scalafmt"))) + //.settings(scalafmtConfig in ThisBuild := Some(file(".scalafmt"))) .settings(name := "fobo-meta") .settings(scalaVersion in ThisBuild := "2.11.7") .settings(liftVersion in ThisBuild <<= liftVersion ?? "3.0-RC4") diff --git a/project/autobuildscript/build-publish-Lift26.txt b/project/autobuildscript/build-publish-Lift26.txt index 2302d8c6..b0345315 100644 --- a/project/autobuildscript/build-publish-Lift26.txt +++ b/project/autobuildscript/build-publish-Lift26.txt @@ -1,6 +1,6 @@ alias pub=publish-signed -set version in ThisBuild:="1.7-SNAPSHOT" +set version in ThisBuild:="1.7" set liftVersion in ThisBuild:="2.6.2" diff --git a/project/autobuildscript/build-publish-Lift3.txt b/project/autobuildscript/build-publish-Lift3.txt index 1fb36349..ecc74833 100644 --- a/project/autobuildscript/build-publish-Lift3.txt +++ b/project/autobuildscript/build-publish-Lift3.txt @@ -1,6 +1,6 @@ alias pub=publish-signed -set version in ThisBuild:="1.7-SNAPSHOT" +set version in ThisBuild:="1.7" set liftVersion in ThisBuild:="3.0-RC4" set scalaVersion in ThisBuild:="2.11.7" diff --git a/project/scalafmt.sbt b/project/scalafmt.sbt index 3e02da5b..bd7eff56 100644 --- a/project/scalafmt.sbt +++ b/project/scalafmt.sbt @@ -1 +1 @@ -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.4.2") +//addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.4.2")