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

Bump dependencies

This commit is contained in:
Alexandre Archambault 2017-10-20 02:48:12 +02:00
parent ce2a01af40
commit 5f5b127563
6 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
http-server/src/main/scala-2.12/coursier/HttpServer.scala
View File

@ -315,14 +315,22 @@ object HttpServerApp extends ServerApp {
if (usage)
app.usageAsked()
val extraArgs0 = remainingArgs ++ extraArgs
t match {
case Left(err) =>
app.error(err)
sys.error("unreached")
if (extraArgs0.nonEmpty)
Console.err.println(
s"Warning: ignoring extra arguments passed on the command-line (${extraArgs0.mkString(", ")})"
)
case Right(opts) =>
HttpServer.server(t)
val extraArgs0 = remainingArgs ++ extraArgs
if (extraArgs0.nonEmpty)
Console.err.println(
s"Warning: ignoring extra arguments passed on the command-line (${extraArgs0.mkString(", ")})"
)
HttpServer.server(opts)
}
}
}

6
project/CrossDeps.scala
View File

@ -13,8 +13,8 @@ object CrossDeps {
def fastParse = setting("com.lihaoyi" %%% "fastparse" % SharedVersions.fastParse)
def scalazCore = setting("org.scalaz" %%% "scalaz-core" % SharedVersions.scalaz)
def scalaJsDom = setting("org.scala-js" %%% "scalajs-dom" % "0.9.2")
def utest = setting("com.lihaoyi" %%% "utest" % "0.4.7")
def scalaJsJquery = setting("be.doeraene" %%% "scalajs-jquery" % "0.9.1")
def scalaJsDom = setting("org.scala-js" %%% "scalajs-dom" % "0.9.3")
def utest = setting("com.lihaoyi" %%% "utest" % "0.5.4")
def scalaJsJquery = setting("be.doeraene" %%% "scalajs-jquery" % "0.9.2")
def scalaJsReact = setting("com.github.japgolly.scalajs-react" %%% "core" % "0.9.0")
}

16
project/Deps.scala
View File

@ -7,27 +7,23 @@ object Deps {
def quasiQuotes = "org.scalamacros" %% "quasiquotes" % "2.1.0"
def fastParse = "com.lihaoyi" %% "fastparse" % SharedVersions.fastParse
def jsoup = "org.jsoup" % "jsoup" % "1.10.2"
def jsoup = "org.jsoup" % "jsoup" % "1.10.3"
def scalaXml = "org.scala-lang.modules" %% "scala-xml" % "1.0.6"
def scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % SharedVersions.scalaz
def caseApp = "com.github.alexarchambault" %% "case-app" % "1.1.3"
def caseApp12 = "com.github.alexarchambault" %% "case-app" % "1.2.0-M3"
def caseApp12 = "com.github.alexarchambault" %% "case-app" % "1.2.0"
def http4sBlazeServer = "org.http4s" %% "http4s-blaze-server" % SharedVersions.http4s
def http4sDsl = "org.http4s" %% "http4s-dsl" % SharedVersions.http4s
def slf4jNop = "org.slf4j" % "slf4j-nop" % "1.7.25"
def okhttpUrlConnection = "com.squareup.okhttp" % "okhttp-urlconnection" % "2.7.5"
def sbtLauncherInterface = "org.scala-sbt" % "launcher-interface" % "1.0.0"
def typesafeConfig = "com.typesafe" % "config" % "1.3.1"
def argonautShapeless = "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M5"
def typesafeConfig = "com.typesafe" % "config" % "1.3.2"
def argonautShapeless = "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M6"
def sbtPgp = Def.setting {
val sbtv = CrossVersion.binarySbtVersion(sbtVersion.value)
val sv = scalaBinaryVersion.value
val ver = sv match {
case "2.10" => "1.0.1"
case "2.12" => "1.1.0-M1"
case _ => "foo" // unused
}
val ver = "1.1.0"
sbtPluginExtra("com.jsuereth" % "sbt-pgp" % ver, sbtv, sv)
}
@ -35,7 +31,7 @@ object Deps {
val version =
if (scalaBinaryVersion.value == "2.10") "0.9.5"
else "0.9.6"
else "0.9.7"
"org.scala-lang.modules" %% "scala-async" % version
}

6
project/SharedVersions.scala
View File

@ -1,10 +1,10 @@
object SharedVersions {
def fastParse = "0.4.3"
def http4s = "0.15.13a"
def fastParse = "1.0.0"
def http4s = "0.15.16a"
def proguard = "5.3.3"
def scalaNative = "0.3.0-coursier-1"
def scalaz = "7.2.13"
def scalaz = "7.2.16"
}

2
tests/metadata

@ -1 +1 @@
Subproject commit 0fedae521fff572d8c3f2f931ac2e1709a026258
Subproject commit 48be68aa0a2a18d5816442dfaefc4f7211b00069

2
tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.0-SNAPSHOT
View File

@ -1,4 +1,4 @@
io.get-coursier:coursier_2.11:1.0.0-SNAPSHOT:compile
org.scala-lang:scala-library:2.11.11:default
org.scala-lang.modules:scala-xml_2.11:1.0.6:default
org.scalaz:scalaz-core_2.11:7.2.13:default
org.scalaz:scalaz-core_2.11:7.2.16:default