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

Update dependencies

This commit is contained in:
Alexandre Archambault 2016-06-19 15:41:04 +02:00
parent 05dffeb7b5
commit ea59ff6974
No known key found for this signature in database
GPG Key ID: 14640A6839C263A9
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build.sbt
View File

@ -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"
)
)

10
project/plugins.sbt
View File

@ -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

2
tests/shared/src/test/resources/resolutions/com.github.ddispaltro/sbt-reactjs/sbtVersion_0.13_scalaVersion_2.10/0.6.+
View File

@ -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

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

@ -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