Improving release process

build.sbt

@@ -16,10 +16,16 @@ resolvers ++= Seq(
   Resolver.url("laughedelic sbt-plugins", url("http://dl.bintray.com/laughedelic/sbt-plugins"))(Resolver.ivyStylePatterns)
 )
 
-dependencyOverrides += "org.apache.ivy" % "ivy" % "2.3.0"
+dependencyOverrides ++= Set(
+  "org.apache.ivy" % "ivy" % "2.3.0",
+  "commons-codec" % "commons-codec" % "1.7",
+  "com.fasterxml.jackson.core" % "jackson-databind" % "2.2.3"
+)
 
 addSbtPlugin("ohnosequences" % "sbt-s3-resolver" % "0.8.0")
 
+addSbtPlugin("ohnosequences" % "sbt-github-release" % "0.1.0")
+
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.2")
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.10.1")

src/main/scala/NiceSbtSettingsPlugin.scala

@@ -2,13 +2,15 @@ package ohnosequences.sbt
 
 import sbt._
 import Keys._
+import sbt.Extracted
 
 import sbtrelease._
 import ReleaseStateTransformations._
 import ReleasePlugin._
 import ReleaseKeys._
 
 import ohnosequences.sbt.SbtS3Resolver._
+import ohnosequences.sbt.SbtGithubReleasePlugin._
 
 import laughedelic.literator.plugin.LiteratorPlugin._
 
@@ -148,8 +150,33 @@ object NiceSettingsPlugin extends sbt.Plugin {
       )
     }
 
-    lazy val genDocsForRelease: ReleaseStep = 
-      ReleaseStep({st => Project.extract(st).runTask(Literator.generateDocs, st)._1 })
+    lazy val genDocsAndCommit = ReleaseStep { st: State =>
+      val newSt = Project.extract(st).runAggregated(Literator.generateDocs, st)
+      Project.extract(newSt) get versionControlSystem map { vcs =>
+        if (vcs.status.!!.trim.nonEmpty) vcs.commit("Autogenerated documentation") ! st.log
+      }
+      newSt
+    }
+
+    lazy val checkPackaging = ReleaseStep { st: State =>
+      Project.extract(st).runAggregated(Keys.`package`, st)
+    }
+
+    lazy val checkGHCreds = ReleaseStep { st: State =>
+      Project.extract(st).runAggregated(GithubRelease.checkGithubCredentials, st)
+    }
+
+    lazy val releaseOnGHStep = ReleaseStep { st: State =>
+      Project.extract(st).runAggregated(GithubRelease.releaseOnGithub, st)
+    }
+
+    lazy val tempSetVersion = ReleaseStep { st: State =>
+      val v = st.get(versions).getOrElse(sys.error("No versions are set! Was this release part executed before inquireVersions?"))._1
+      st.log.info("Setting version to " + v)
+      reapply(Seq(
+        version in ThisBuild := v
+      ), st)
+    }
 
     lazy val releaseSettings: Seq[Setting[_]] = 
       ReleasePlugin.releaseSettings ++ Seq(
@@ -176,16 +203,21 @@ object NiceSettingsPlugin extends sbt.Plugin {
         }
       , releaseProcess := // use thisProjectRef.value if needed
           Seq[ReleaseStep](
-            genDocsForRelease // <--
-          , checkSnapshotDependencies
-          , inquireVersions
-          , runTest
-          , setReleaseVersion
-          , commitReleaseVersion
-          , tagRelease
-          , publishArtifacts
-          , setNextVersion
-          , pushChanges
+          checkSnapshotDependencies // no snapshot deps in release
+          , checkGHCreds            // check that we can publish Github release
+          , checkPackaging          // try to package the artifacts
+          , genDocsAndCommit        // generate literator docs and commit if needed
+          , runTest                 // compile and test
+          , inquireVersions         // ask about release version and the next one
+          , tempSetVersion          // set the chosed version for publishing
+          , publishArtifacts        // try to publish artifacts
+          , setReleaseVersion       // if it was ok, set the version finally
+          , commitReleaseVersion    // and commit it
+          , tagRelease              // and make a tag
+          , releaseOnGHStep         // and publish notes on github
+          , setNextVersion          // bump the version
+          , commitNextVersion       // commit it
+          , pushChanges             // and push everything to github
           )
       )