From ea59ff6974b06b1595f704378bb8f82b6b9695bd Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Sun, 19 Jun 2016 15:41:04 +0200 Subject: [PATCH] Update dependencies --- build.sbt | 16 ++++++++-------- project/plugins.sbt | 10 +++++----- .../sbtVersion_0.13_scalaVersion_2.10/0.6.+ | 2 +- .../io.get-coursier/coursier_2.11/1.0.0-SNAPSHOT | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.sbt b/build.sbt index 9b5a470a8..1b1df7f12 100644 --- a/build.sbt +++ b/build.sbt @@ -187,15 +187,15 @@ lazy val core = crossProject ) ++ { if (scalaVersion.value.startsWith("2.10.")) Seq() else Seq( - "org.scala-lang.modules" %% "scala-xml" % "1.0.3" + "org.scala-lang.modules" %% "scala-xml" % "1.0.5" ) } ) .jsSettings( libraryDependencies ++= Seq( "com.github.japgolly.fork.scalaz" %%% "scalaz-core" % (if (scalaVersion.value.startsWith("2.10.")) "7.1.1" else "7.1.2"), - "org.scala-js" %%% "scalajs-dom" % "0.8.0", - "be.doeraene" %%% "scalajs-jquery" % "0.8.0" + "org.scala-js" %%% "scalajs-dom" % "0.9.1", + "be.doeraene" %%% "scalajs-jquery" % "0.9.0" ) ) @@ -218,8 +218,8 @@ lazy val tests = crossProject .settings( name := "coursier-tests", libraryDependencies ++= Seq( - "org.scala-lang.modules" %% "scala-async" % "0.9.1" % "provided", - "com.lihaoyi" %%% "utest" % "0.3.0" % "test" + "org.scala-lang.modules" %% "scala-async" % "0.9.5" % "provided", + "com.lihaoyi" %%% "utest" % "0.4.3" % "test" ), unmanagedResourceDirectories in Test += (baseDirectory in LocalRootProject).value / "tests" / "shared" / "src" / "test" / "resources", testFrameworks += new TestFramework("utest.runner.Framework") @@ -329,7 +329,7 @@ lazy val cli = project if (scalaVersion.value startsWith "2.10.") Seq() else - Seq("com.github.alexarchambault" %% "case-app" % "1.0.0-RC2") + Seq("com.github.alexarchambault" %% "case-app" % "1.0.0-RC3") }, resourceGenerators in Compile += packageBin.in(bootstrap).in(Compile).map { jar => Seq(jar) @@ -525,8 +525,8 @@ lazy val `simple-web-server` = project libraryDependencies ++= Seq( "org.http4s" %% "http4s-blazeserver" % http4sVersion, "org.http4s" %% "http4s-dsl" % http4sVersion, - "org.slf4j" % "slf4j-nop" % "1.7.19", - "com.github.alexarchambault" %% "case-app" % "1.0.0-RC2" + "org.slf4j" % "slf4j-nop" % "1.7.21", + "com.github.alexarchambault" %% "case-app" % "1.0.0-RC3" ) ) diff --git a/project/plugins.sbt b/project/plugins.sbt index 6b8a62f5a..a2cc88871 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,9 @@ -addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.6.8") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.8") +addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.8.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.10") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.1.0") -addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.0") -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M11") +addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.2") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M12") addSbtPlugin("com.typesafe.sbt" % "sbt-proguard" % "0.2.2") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.8") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.9") libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value diff --git a/tests/shared/src/test/resources/resolutions/com.github.ddispaltro/sbt-reactjs/sbtVersion_0.13_scalaVersion_2.10/0.6.+ b/tests/shared/src/test/resources/resolutions/com.github.ddispaltro/sbt-reactjs/sbtVersion_0.13_scalaVersion_2.10/0.6.+ index 42ad9aa4c..75b29d188 100644 --- a/tests/shared/src/test/resources/resolutions/com.github.ddispaltro/sbt-reactjs/sbtVersion_0.13_scalaVersion_2.10/0.6.+ +++ b/tests/shared/src/test/resources/resolutions/com.github.ddispaltro/sbt-reactjs/sbtVersion_0.13_scalaVersion_2.10/0.6.+ @@ -67,7 +67,7 @@ org.webjars.npm:once:1.3.3:default org.webjars.npm:private:0.1.6:default org.webjars.npm:q:1.1.2:default org.webjars.npm:react-tools:0.13.3:default -org.webjars.npm:recast:0.10.24:default +org.webjars.npm:recast:0.10.25:default org.webjars.npm:sigmund:1.0.1:default org.webjars.npm:source-map:0.4.4:default org.webjars.npm:wrappy:1.0.1:default 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 160369f81..c28e9eb22 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 @@ -2,5 +2,5 @@ io.get-coursier:coursier_2.11:1.0.0-SNAPSHOT:compile org.jsoup:jsoup:1.9.2:default org.scala-lang:scala-library:2.11.8:default org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4:default -org.scala-lang.modules:scala-xml_2.11:1.0.4:default +org.scala-lang.modules:scala-xml_2.11:1.0.5:default org.scalaz:scalaz-core_2.11:7.1.2:default