Merge pull request #6 from zmanio/v2.0.x

Merging version 2.0.1 into master.

.travis.yml

@@ -6,13 +6,10 @@ scala:
 branches:
   only:
     - master
-
-before_script:
-  - git config --global user.email "z@zman.io"
-  - git config --global user.name "zmanio-ci"
-  - git config --global push.default simple
 
-script: sbt ++$TRAVIS_SCALA_VERSION --warn coveralls ghpages-push-site
+script: sbt ++$TRAVIS_SCALA_VERSION clean coverage test
+
+after_success: sbt coveralls
 
 notifications:
   email:

README.md

@@ -83,10 +83,10 @@ Prerequisites:
 To use from SBT, add the following to your build.sbt file:
 
 ```scala
-libraryDependencies += "io.zman" %% "atmos" % "2.0"
+libraryDependencies += "io.zman" %% "atmos" % "2.0.1"
 ```
 
-For other build systems or to download the jar see [atmos in the central repository](http://mvnrepository.com/artifact/io.zman/atmos_2.10/2.0).
+For other build systems or to download the jar see [atmos in the central repository](http://mvnrepository.com/artifact/io.zman/atmos_2.10/2.0.1).
 
 <a name="using-the-library"></a>
 

build.sbt

@@ -1,6 +1,3 @@
-import SiteKeys._
-import GhReadmeKeys._
-import GhPagesKeys.ghpagesNoJekyll
 import SonatypeKeys._
 
 //
@@ -9,7 +6,7 @@ import SonatypeKeys._
 
 name := "atmos"
 
-version := "2.0"
+version := "2.0.1"
 
 description := "minimalist retry-on-failure behavior for scala"
 
@@ -26,50 +23,15 @@ organizationHomepage := Some(url("http://zman.io/"))
 scalaVersion := "2.10.4"
 
 libraryDependencies ++= Seq(
-  "io.zman" %% "rummage" % "1.0",
-  "com.typesafe.akka" %% "akka-actor" % "2.3.0" % "provided",
+  "io.zman" %% "rummage" % "1.2",
+  "com.typesafe.akka" %% "akka-actor" % "2.3.2" % "provided",
   "org.slf4j" % "slf4j-api" % "1.7.5" % "provided",
-  "org.scalatest" %% "scalatest" % "2.0" % "test",
-  "org.scalamock" %% "scalamock-scalatest-support" % "3.1.RC1" % "test"
+  "org.scalatest" %% "scalatest" % "2.2.4" % "test",
+  "org.scalamock" %% "scalamock-scalatest-support" % "3.2" % "test"
 )
 
 licenses := Seq("The Apache Software License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
 
-ScoverageSbtPlugin.instrumentSettings
-
-CoverallsPlugin.coverallsSettings
-
-//
-// Documentation site generation.
-//
-
-site.settings
-
-includeFilter in makeSite := "*.html" | "*.css" | "*.png" | "*.jpg" | "*.gif" | "*.js" | "*.md" | "*.yml"
-
-site.includeScaladoc("api")
-
-ghreadme.settings
-
-readmeMappings ++= Seq(
-  "." --- Seq(
-    "title"    -> "about",
-    "headline" -> "minimalist retry-on-failure behavior for scala",
-    "layout"   -> "home"
-  ),
-  "changelog" --- Seq(
-    "title"    -> "changelog",
-    "headline" -> "they say history inevitably repeats itself",
-    "layout"   -> "page"
-  )
-)
-
-ghpages.settings
-
-ghpagesNoJekyll := false
-
-git.remoteRepo := (sys.env get "GH_TOKEN" map (t => s"https://$t:@github.com/") getOrElse "git@github.com:") + "zmanio/atmos.git"
-
 //
 // Publishing to Sonatype
 //
@@ -89,4 +51,4 @@ pomExtra := (
       <url>http://zman.io</url>
     </developer>
   </developers>
-)
+)

changelog/README.md

@@ -1,3 +1,7 @@
+# 2.0.1 (2015-04-18)
+
+Rebuilt the 2.0 library with a version of [scoverage](https://github.com/scoverage/sbt-scoverage) that does not add itself to this library's transitive dependency chain.
+
 # 2.0 (2014-09-12)
 
 Moved to the `io.zman` organization namespace and moved from the `atmos.retries` package to the `atmos` package.

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.2
+sbt.version=0.13.6

project/plugins.sbt

@@ -1,13 +1,7 @@
-addSbtPlugin("com.sksamuel.scoverage" % "sbt-scoverage" % "0.95.1")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.4")
 
-addSbtPlugin("com.sksamuel.scoverage" %% "sbt-coveralls" % "0.0.5")
+addSbtPlugin("org.scoverage" %% "sbt-coveralls" % "1.0.0.BETA1")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.7.1")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.2")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
-
-addSbtPlugin("io.zman" % "sbt-ghreadme" % "1.1")
-
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.2")