Bump dependencies

This commit is contained in:
Alexandre Archambault 2017-05-15 15:32:49 +02:00
parent 2f350e058b
commit f62a110cfa
6 changed files with 25 additions and 25 deletions

View File

@ -308,7 +308,7 @@ lazy val addBootstrapInProguardedJar = {
}
lazy val proguardedCli = Seq(
ProguardKeys.proguardVersion.in(Proguard) := "5.3",
ProguardKeys.proguardVersion.in(Proguard) := SharedVersions.proguard,
ProguardKeys.options.in(Proguard) ++= Seq(
"-dontwarn",
"-keep class coursier.cli.Coursier {\n public static void main(java.lang.String[]);\n}",

View File

@ -19,13 +19,13 @@ import scalaz.concurrent.Task
final case class AuthOptions(
@ExtraName("u")
@ValueDescription("user")
user: String,
user: String = "",
@ExtraName("P")
@ValueDescription("password")
password: String,
password: String = "",
@ExtraName("r")
@ValueDescription("realm")
realm: String
realm: String = ""
) {
def checks(): Unit = {
if (user.nonEmpty && password.isEmpty)
@ -50,21 +50,21 @@ final case class AuthOptions(
final case class VerbosityOptions(
@ExtraName("v")
verbose: Int @@ Counter,
verbose: Int @@ Counter = Tag.of(0),
@ExtraName("q")
quiet: Boolean
quiet: Boolean = false
) {
lazy val verbosityLevel = Tag.unwrap(verbose) - (if (quiet) 1 else 0)
}
final case class HttpServerOptions(
@Recurse
auth: AuthOptions,
auth: AuthOptions = AuthOptions(),
@Recurse
verbosity: VerbosityOptions,
verbosity: VerbosityOptions = VerbosityOptions(),
@ExtraName("d")
@ValueDescription("served directory")
directory: String,
directory: String = ".",
@ExtraName("h")
@ValueDescription("host")
host: String = "0.0.0.0",
@ -72,15 +72,15 @@ final case class HttpServerOptions(
@ValueDescription("port")
port: Int = 8080,
@ExtraName("s")
acceptPost: Boolean,
acceptPost: Boolean = false,
@ExtraName("t")
acceptPut: Boolean,
acceptPut: Boolean = false,
@ExtraName("w")
@HelpMessage("Accept write requests. Equivalent to -s -t")
acceptWrite: Boolean,
acceptWrite: Boolean = false,
@ExtraName("l")
@HelpMessage("Generate content listing pages for directories")
listPages: Boolean
listPages: Boolean = false
)
object HttpServer {

View File

@ -13,8 +13,8 @@ object CrossDeps {
def fastParse = setting("com.lihaoyi" %%% "fastparse" % "0.4.2")
def scalazCore = setting("org.scalaz" %%% "scalaz-core" % SharedVersions.scalaz)
def scalaJsDom = setting("org.scala-js" %%% "scalajs-dom" % "0.9.1")
def utest = setting("com.lihaoyi" %%% "utest" % "0.4.5")
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 scalaJsReact = setting("com.github.japgolly.scalajs-react" %%% "core" % "0.9.0")
}

View File

@ -10,14 +10,14 @@ object Deps {
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-M2"
def caseApp12 = "com.github.alexarchambault" %% "case-app" % "1.2.0-M3"
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.22"
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-M4"
def argonautShapeless = "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M5"
def scalaAsync = Def.setting {
@ -56,6 +56,6 @@ object Deps {
"com.google.code.findbugs" % "jsr305" % "2.0.2",
"org.ow2.asm" % "asm-commons" % "5.0.3",
"org.ow2.asm" % "asm-util" % "5.0.3",
"org.slf4j" % "slf4j-api" % "1.7.12"
"org.slf4j" % "slf4j-api" % "1.7.25"
)
}
}

View File

@ -1,8 +1,8 @@
object SharedVersions {
val scalaz = "7.2.8"
def http4s = "0.15.12a"
def proguard = "5.3.3"
def scalaz = "7.2.12"
val http4s = "0.15.9a"
}
}

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.8:default
org.scalaz:scalaz-core_2.11:7.2.12:default