Release 2.0 prep tweaks

Author: Simeon H.K. Fitch

README.md

@@ -43,7 +43,7 @@ Each of the files should have the following contents.
 
 `project/plugins.sbt`:
 
-     addSbtPlugin("com.typesafe.sbt" % "sbt-pom-reader" % "1.0.1")
+     addSbtPlugin("com.typesafe.sbt" % "sbt-pom-reader" % "2.0.0")
      
 
 ## Configuring projects

notes/1.1.markdown renamed to notes/2.0.markdown

@@ -1,14 +1,16 @@
 # Release Process Outline
 
-0. Write release notes
-1. Confirm value of `git.baseVersion` in `version.sbt`
-2. `git tag v<version> && git push`
-3. `sbt scripted publish`
-4. Confirm everything's OK; check Bintray package
-5. `sbt bintrayRelease`
-6. Update `git.baseVersion` to next release.
-7. Update `README.md` to reference new binary version.
-8. Commit and push.
-9. Point Bintray package to release notes
-10. Create a release entry in GitHub(?)
+
+4. Run `git clean -fdx`. This makes sure there are no unexpected dependencies or artifacts that could affect the build.
+1. Create a branch to do the release work on. Something like `release-<X>.<Y>.<Z>` is good.
+2. Write release notes in Markdown with filename  `notes/<X>.<Y>.markdown`. Go through the commit logs and collect the major new features, bug fixes, deprecations, and anything else relevant to users. Making note of breaking changes is particularly important.
+5. Run `git tag -u <GPG key id> v<X>.<Y>.<Z> && git push`. This creates the tag that the `sbt-git` plugin will use to extract the artifact version number and publishes it. Providing a GPG key is just good form. [Here's some documention](http://www.dewinter.com/gnupg_howto/english/GPGMiniHowto-3.html) on how to get set up to have one.
+6. Run `sbt scripted publish`. Executes the tests first and then stages the binary in Bintray. [See SBT documentation](http://www.scala-sbt.org/0.13/docs/Bintray-For-Plugins.html) on how to get set up with Bintray. 
+7. Confirm the plugin is properly staged for release on Bintray.  The Bintray page for `sbt-pom-reader` is [here](https://bintray.com/sbt/sbt-plugin-releases/sbt-pom-reader/view).
+8. Run `sbt bintrayRelease`. This moves the plugin from the staged release to published release on Bintray.
+9. Update `git.baseVersion` to next release.
+10. Update `README.md` to reference new binary version.
+11. Commit and push.
+12. Edit Bintray info to point to release notes on Github.
+13. Create a release entry in GitHub
 

notes/release-process.markdown

@@ -5,17 +5,9 @@ resolvers += Resolver.url(
 
 resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
 
-// addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3")
-
-// addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1")
-
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.4")
 
-
-// Until bintray-sbt 0.3.0 is published...
-lazy val root = (project in file(".")).dependsOn(bintray)
-
-lazy val bintray = uri("git://github.com/softprops/bintray-sbt.git#d8244dd")
+addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
 
 libraryDependencies <+= (sbtVersion) { sv =>
   "org.scala-sbt" % "scripted-plugin" % sv

project/plugins.sbt

@@ -1,5 +1,15 @@
-versionWithGit
+enablePlugins(GitBranchPrompt)
 
-git.baseVersion := "2.0"
+enablePlugins(GitVersioning)
+
+git.baseVersion := "2.1"
 
 git.useGitDescribe := true
+
+// Not sure why the following are necessary...
+git.gitDescribedVersion <<= git.gitDescribedVersion((v) => v.map(_.drop(1)))
+
+git.gitTagToVersionNumber := { tag: String =>
+  if(tag matches "v[0.9]+\\..*") Some(tag.drop(1))
+  else None
+}