From f62a110cfaa12765b91483ef37fea3be70843399 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 15 May 2017 15:32:49 +0200 Subject: [PATCH] Bump dependencies --- build.sbt | 2 +- .../src/main/scala/coursier/HttpServer.scala | 24 +++++++++---------- project/CrossDeps.scala | 4 ++-- project/Deps.scala | 10 ++++---- project/SharedVersions.scala | 8 +++---- .../coursier_2.11/1.0.0-SNAPSHOT | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build.sbt b/build.sbt index dd406499b..e8f93af4b 100644 --- a/build.sbt +++ b/build.sbt @@ -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}", diff --git a/http-server/src/main/scala/coursier/HttpServer.scala b/http-server/src/main/scala/coursier/HttpServer.scala index 6ae36dd71..4c5ee8ada 100644 --- a/http-server/src/main/scala/coursier/HttpServer.scala +++ b/http-server/src/main/scala/coursier/HttpServer.scala @@ -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 { diff --git a/project/CrossDeps.scala b/project/CrossDeps.scala index 863d2bd1d..04cf9e3a8 100644 --- a/project/CrossDeps.scala +++ b/project/CrossDeps.scala @@ -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") } diff --git a/project/Deps.scala b/project/Deps.scala index d85772737..ababae96a 100644 --- a/project/Deps.scala +++ b/project/Deps.scala @@ -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" ) -} \ No newline at end of file +} diff --git a/project/SharedVersions.scala b/project/SharedVersions.scala index 1eecde8b2..0d282b606 100644 --- a/project/SharedVersions.scala +++ b/project/SharedVersions.scala @@ -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" - -} \ No newline at end of file +} diff --git a/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.0-SNAPSHOT b/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.0-SNAPSHOT index eee9def25..2176051fe 100644 --- a/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.0-SNAPSHOT +++ b/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.0-SNAPSHOT @@ -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