Merge pull request #28 from hacklanta/1.1.0-release-prep

1.1.0 Release Prep
hacklanta · Jan 17, 2018 · 857fe47 · 857fe47
2 parents 12fb099 + 89bc9d9
commit 857fe47
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -17,11 +17,13 @@ once reported on Github.
 
 ## Including
 
-You can include Formality directly as a dependency in your `build.sbt`:
+You can include Formality directly as a dependency in your `build.sbt`,
+suffixing the major and minor Lift version you are using (3.0 and 3.1 are
+currently supported):
 
 ```
 libraryDependencies ++= Seq(
-  "com.hacklanta" %% "lift-formality" % "1.0.0"
+  "com.hacklanta" %% "lift-formality_3.1" % "1.1.0"
 )
 ```
 

diff --git a/build.sbt b/build.sbt
@@ -5,10 +5,13 @@ name := "lift-formality"
 
 organization := "com.hacklanta"
 
-version := "1.1.0-SNAPSHOT"
+version := "1.1.0"
 
 scalaVersion := "2.11.12"
 
+// Disable package scaladocs, as 2.11.12 Scaladoc + Java 9 seems to go boom.
+publishArtifact in (Compile, packageDoc) := false
+
 liftVersion <<= liftVersion ?? "3.1.0"
 
 liftEdition <<= liftVersion apply { _.substring(0,3) }

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=0.13.17-RC1