luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #241 from tanishiking/enable-config-resource-with-gigahorse 

Enable sbt to specify -Dconfig.resource=/path/to/configFile without disabling gigahorse
This commit is contained in:
eugene yokota 2018-05-17 07:48:54 +02:00 committed by GitHub
parent 4106b37709 c24ab5c4ee
commit 7eb25984d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/scala/sbt/librarymanagement/Http.scala
View File

@ -3,5 +3,5 @@ package sbt.librarymanagement
import gigahorse._, support.okhttp.Gigahorse
object Http {
lazy val http: HttpClient = Gigahorse.http(Gigahorse.config)
lazy val http: HttpClient = Gigahorse.http(gigahorse.Config())
}

2
ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/GigahorseUrlHandler.scala
View File

@ -214,7 +214,7 @@ object GigahorseUrlHandler {
private val EmptyBuffer: Array[Byte] = new Array[Byte](0)
lazy val http: HttpClient = Gigahorse.http(Gigahorse.config)
lazy val http: HttpClient = Gigahorse.http(gigahorse.Config())
private lazy val okHttpClient: OkHttpClient = {
http