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

Merge pull request #51 from alexarchambault/develop 

Cleaning
This commit is contained in:
Alexandre Archambault 2015-06-28 18:54:26 +02:00
parent cb9dfc5906 5de7e41d5e
commit 7c4cf0ff72
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project/Coursier.scala
View File

@ -62,7 +62,7 @@ object CoursierBuild extends Build {
resolvers += "Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases"
) ++ publishingSettings
private lazy val commonCoreSettings = Seq[Setting[_]](
private lazy val commonCoreSettings = commonSettings ++ Seq[Setting[_]](
name := "coursier",
libraryDependencies += "org.scala-lang.modules" %% "scala-async" % "0.9.1" % "provided",
unmanagedSourceDirectories in Compile += (baseDirectory in LocalRootProject).value / "core" / "src" / "main" / "scala",
@ -73,7 +73,7 @@ object CoursierBuild extends Build {
)
lazy val coreJvm = Project(id = "core-jvm", base = file("core-jvm"))
.settings(commonSettings ++ commonCoreSettings: _*)
.settings(commonCoreSettings: _*)
.settings(
libraryDependencies ++= Seq(
"org.scalaz" %% "scalaz-concurrent" % "7.1.2",
@ -87,7 +87,7 @@ object CoursierBuild extends Build {
)
lazy val coreJs = Project(id = "core-js", base = file("core-js"))
.settings(commonSettings ++ commonCoreSettings: _*)
.settings(commonCoreSettings: _*)
.settings(
libraryDependencies ++= Seq(
"org.scala-js" %%% "scalajs-dom" % "0.8.0",