Skip to content

Commit 4e69a1b

Browse files
Merge pull request #240 from maiflai/ahc3
Ahc3
2 parents 658a1ba + 6635601 commit 4e69a1b

File tree

7 files changed

+7
-222
lines changed

7 files changed

+7
-222
lines changed

core/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description :=
44
"Core Dispatch module wrapping async-http-client"
55

66
libraryDependencies +=
7-
"org.asynchttpclient" % "async-http-client" % "2.10.4"
7+
"org.asynchttpclient" % "async-http-client" % "3.0.0"
88

99
enablePlugins(BuildInfoPlugin)
1010

core/src/main/scala/as/oauth/token.scala

Lines changed: 0 additions & 26 deletions
This file was deleted.

core/src/main/scala/defaults.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import io.netty.util.{HashedWheelTimer, Timer}
44
import org.asynchttpclient.DefaultAsyncHttpClientConfig.Builder
55
import org.asynchttpclient._
66

7+
import java.time.Duration
8+
79
object Defaults {
810
implicit def executor = scala.concurrent.ExecutionContext.Implicits.global
911

@@ -26,9 +28,11 @@ private[dispatch] object InternalDefaults {
2628
private object BasicDefaults extends Defaults {
2729
lazy val timer = new HashedWheelTimer()
2830

31+
private val userAgent = "Dispatch/%s" format BuildInfo.version
32+
private val infinite = Duration.ofMillis(-1)
2933
def builder: Builder = new DefaultAsyncHttpClientConfig.Builder()
30-
.setUserAgent("Dispatch/%s" format BuildInfo.version)
31-
.setRequestTimeout(-1) // don't timeout streaming connections
34+
.setUserAgent(userAgent)
35+
.setRequestTimeout(infinite) // don't timeout streaming connections
3236
.setUseProxyProperties(true)
3337
}
3438

core/src/main/scala/oauth/exchange.scala

Lines changed: 0 additions & 97 deletions
This file was deleted.

core/src/main/scala/oauth/package.scala

Lines changed: 0 additions & 6 deletions
This file was deleted.

core/src/main/scala/oauth/requests.scala

Lines changed: 0 additions & 20 deletions
This file was deleted.

core/src/test/scala/oauth/exchange.scala

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)