bump version to 0.3.5

Author: casualjim

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.0
+sbt.version=0.13.5

project/build.scala

@@ -65,22 +65,30 @@ object build extends Build {
  unmanagedSourceDirectories in c <+= (scalaVersion, sourceDirectory in c) {
  case (v, dir) if v startsWith "2.9" => dir / "scala_2.9"
  case (v, dir) if v startsWith "2.10" => dir / "scala_2.10"
+ case (v, dir) if v startsWith "2.11" => dir / "scala_2.10"
  }
 
  val projectSettings = Seq(
  organization := "com.wordnik.swagger",
  name := "swagger-async-httpclient",
- scalaVersion := "2.10.0",
- crossScalaVersions := Seq("2.9.1", "2.9.1-1", "2.9.2", "2.9.3", "2.10.0"),
- scalacOptions ++= Seq("-unchecked", "-deprecation", "-optimize", "-Xcheckinit", "-encoding", "utf8", "-P:continuations:enable"),
+ scalaVersion := "2.10.4",
+ crossScalaVersions := Seq("2.10.4", "2.11.2"),
+ scalacOptions ++= Seq("-unchecked", "-deprecation", "-optimize", "-Xcheckinit", "-encoding", "utf8"),
+ scalacOptions <++= scalaVersion map {
+ case v if v.startsWith("2.9") || v.startsWith("2.10") => Seq("-P:continuations:enable")
+ case _ => Seq.empty
+ },
  scalacOptions in Compile <++= scalaVersion map ({
  case v if v startsWith "2.10" => Seq("-language:implicitConversions", "-language:reflectiveCalls")
  case _ => Seq.empty
  }),
  javacOptions in compile ++= Seq("-target", "1.6", "-source", "1.6", "-Xlint:deprecation"),
  manifestSetting,
  autoCompilerPlugins := true,
- libraryDependencies <+= scalaVersion(sv => compilerPlugin("org.scala-lang.plugins" % "continuations" % sv)),
+ libraryDependencies <++= scalaVersion {
+ case v if v.startsWith("2.9") || v.startsWith("2.10") => Seq(compilerPlugin("org.scala-lang.plugins" % "continuations" % v))
+ case _ => Seq.empty
+ },
  parallelExecution in Test := false,
  commands += Command.args("s", "<shell command>") { (state, args) =>
  args.mkString(" ") ! state.log
@@ -107,18 +115,18 @@ object build extends Build {
  base = file("."),
  settings = defaultSettings ++ Seq(
  libraryDependencies ++= Seq(
- "org.scalatra.rl" %% "rl" % "0.4.8",
- "org.slf4j" % "slf4j-api" % "1.7.5",
- "ch.qos.logback" % "logback-classic" % "1.0.13" % "provided",
- "org.json4s" %% "json4s-jackson" % "3.2.5",
+ "org.scalatra.rl" %% "rl" % "0.4.10",
+ "org.slf4j" % "slf4j-api" % "1.7.7",
+ "ch.qos.logback" % "logback-classic" % "1.1.2" % "provided",
+ "org.json4s" %% "json4s-jackson" % "3.2.10",
  "com.googlecode.juniversalchardet" % "juniversalchardet" % "1.0.3",
  "eu.medsea.mimeutil" % "mime-util" % "2.1.3" exclude("org.slf4j", "slf4j-log4j12") exclude("log4j", "log4j"),
- "com.ning" % "async-http-client" % "1.7.19"
+ "com.ning" % "async-http-client" % "1.8.14"
  ),
  libraryDependencies <+= scalaVersion {
  case "2.9.3" => "org.clapper" % "grizzled-slf4j_2.9.2" % "0.6.10" exclude("org.scala-lang", "scala-library")
  case v if v startsWith "2.9" => "org.clapper" %% "grizzled-slf4j" % "0.6.10"
- case v => "com.typesafe" %% "scalalogging-slf4j" % "1.0.1"
+ case v => "com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2"
  },
  libraryDependencies <++= scalaVersion {
  case v if v startsWith "2.9" => Seq("com.typesafe.akka" % "akka-actor" % "2.0.5")

project/plugins.sbt

@@ -1,4 +1,5 @@
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.7.1")
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")
 
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.2.5")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.3.2")
 
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.6")

src/main/scala_2.10/com/wordnik/swagger/client/RestClient.scala

@@ -1,29 +1,27 @@
 package com.wordnik.swagger.client
 
-import com.ning.http._
-import client._
-import client.{ Cookie => AhcCookie }
-import collection.JavaConverters._
-import java.util.{concurrent, TimeZone, Date, Locale}
-import java.util.concurrent.ConcurrentHashMap
-import io.Codec
-import java.nio.charset.Charset
 import java.io.File
 import java.net.URI
-import rl.{UrlCodingUtils, MapQueryString}
-import scala.concurrent.{Promise, ExecutionContext, Future}
-import scala.concurrent.duration._
-import org.json4s.JsonAST.JValue
-import org.json4s.jackson.JsonMethods
+import java.nio.charset.Charset
 import java.text.SimpleDateFormat
-import scala.util.{Failure, Success}
-import com.wordnik.swagger.client.async.BuildInfo
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicLong
-import java.util.{ concurrent => juc }
-import org.jboss.netty.util.{HashedWheelTimer, Timer}
-import org.jboss.netty.channel.socket.nio.{NioWorkerPool, NioClientSocketChannelFactory}
+import java.util.{Date, Locale, TimeZone, concurrent => juc}
+
+import com.ning.http.client._
+import com.ning.http.client.cookie.{Cookie => AhcCookie}
 import com.ning.http.client.providers.netty.NettyAsyncHttpProviderConfig
+import com.wordnik.swagger.client.async.BuildInfo
+import org.jboss.netty.channel.socket.nio.{NioClientSocketChannelFactory, NioWorkerPool}
+import org.jboss.netty.util.{HashedWheelTimer, Timer}
 import rl.Imports._
+import rl.{MapQueryString, UrlCodingUtils}
+
+import scala.collection.JavaConverters._
+import scala.concurrent.duration._
+import scala.concurrent.{ExecutionContext, Future, Promise}
+import scala.io.Codec
+import scala.util.Failure
 
 object RestClient {
 
@@ -261,7 +259,7 @@ object RestClient {
 
 class RestClient(config: SwaggerConfig) extends TransportClient with Logging {
 
- import RestClient._
+ import com.wordnik.swagger.client.RestClient._
  protected def underlying: Defaults = {
  if (InternalDefaults.inTrapExit) InternalDefaults.SbtProcessDefaults
  else InternalDefaults.BasicDefaults
@@ -275,7 +273,7 @@ class RestClient(config: SwaggerConfig) extends TransportClient with Logging {
  setAllowPoolingConnection true // enable http keep-alive
  setFollowRedirects config.followRedirects).build()
 
- import StringHttpMethod._
+ import com.wordnik.swagger.client.StringHttpMethod._
  implicit val execContext = ExecutionContext.fromExecutorService(clientConfig.executorService())
 
  private[this] val mimes = new Mimes with Logging {
@@ -345,14 +343,16 @@ class RestClient(config: SwaggerConfig) extends TransportClient with Logging {
 
  private[this] def addCookies(req: AsyncHttpClient#BoundRequestBuilder) = {
  cookies foreach { cookie =>
- val ahcCookie = new AhcCookie(
- cookie.cookieOptions.domain,
+ val ahcCookie = AhcCookie.newValidCookie(
  cookie.name,
  cookie.value,
+ cookie.cookieOptions.domain,
+ cookie.value,
  cookie.cookieOptions.path,
+ -1,
  cookie.cookieOptions.maxAge,
  cookie.cookieOptions.secure,
- cookie.cookieOptions.version)
+ cookie.cookieOptions.httpOnly)
  req.addCookie(ahcCookie)
  }
  req

version.sbt

@@ -1 +1,2 @@
-version in ThisBuild := "0.3.4"
+version in ThisBuild := "0.3.5"
+