Merge pull request #13 from circe/updates

Updates

build.sbt

@@ -86,24 +86,12 @@ scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value
 publishMavenStyle := true
 publishArtifact in Test := false
 pomIncludeRepository := { _ => false }
-publishTo := {
-  val nexus = "https://oss.sonatype.org/"
+publishTo := Some {
   if (isSnapshot.value)
-    Some("snapshots" at nexus + "content/repositories/snapshots")
+    Opts.resolver.sonatypeSnapshots
   else
-    Some("releases"  at nexus + "service/local/staging/deploy/maven2")
+    Opts.resolver.sonatypeStaging
 }
-credentials ++= (
-  for {
-    username <- Option(System.getenv().get("SONATYPE_USERNAME"))
-    password <- Option(System.getenv().get("SONATYPE_PASSWORD"))
-  } yield Credentials(
-    "Sonatype Nexus Repository Manager",
-    "oss.sonatype.org",
-    username,
-    password
-  )
-).toSeq
 
 scmInfo := Some(
   ScmInfo(

project/build.properties

@@ -1 +1 @@
-sbt.version=1.0.4
+sbt.version=1.1.1

project/plugins.sbt

@@ -3,7 +3,7 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.0")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
 addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.7.0")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18")

src/main/scala/io.circe.config/parser.scala

@@ -48,7 +48,7 @@ import com.typesafe.config._
  */
 object parser extends Parser {
 
-  private[this] final def toJson[T](parseConfig: => Config): Either[ParsingFailure, Json] = {
+  private[this] final def toJson(parseConfig: => Config): Either[ParsingFailure, Json] = {
     def convertValueUnsafe(value: ConfigValue): Json = value match {
       case obj: ConfigObject =>
         Json.fromFields(obj.asScala.mapValues(convertValueUnsafe))