Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up javascript libraryDependencies #620

Merged
merged 1 commit into from
Dec 13, 2017
Merged

Clean up javascript libraryDependencies #620

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,22 @@ lazy val common = crossProject.in(file("common")).
libraryDependencies ++=
depends.reflect(scalaOrganization.value, scalaVersion.value) ++
depends.paradise(scalaVersion.value) ++
depends.scalaXML(scalaVersion.value) ++
Seq("org.scalacheck" %%% "scalacheck" % "1.13.5" % "test",
"org.scala-lang.modules" %%% "scala-parser-combinators" % "1.0.5"),
depends.scalaXML(scalaVersion.value),
moduleSettings("common")++
Seq(name := "specs2-common")
).
jsSettings(depends.jsTest, moduleJsSettings("common")).
jvmSettings(moduleJvmSettings("common"))
jsSettings(depends.jsTest, moduleJsSettings("common"),
libraryDependencies ++= Seq(
"org.scalacheck" %%% "scalacheck" % "1.13.5" % "test",
"org.scala-lang.modules" %%% "scala-parser-combinators" % "1.0.5"
)
).
jvmSettings(moduleJvmSettings("common"),
libraryDependencies ++= Seq(
"org.scalacheck" %% "scalacheck" % "1.13.5" % "test",
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.5"
)
)

lazy val commonJs = common.js.dependsOn(fpJs)
lazy val commonJvm = common.jvm.dependsOn(fpJvm)
Expand Down Expand Up @@ -177,7 +185,7 @@ lazy val guide = project.in(file("guide")).

lazy val gwt = project.in(file("gwt")).
settings(Seq(
libraryDependencies += "com.chuusai" %%% "shapeless" % shapelessVersion) ++
libraryDependencies += "com.chuusai" %% "shapeless" % shapelessVersion) ++
moduleSettings("gwt") ++
Seq(name := "specs2-gwt"):_*).
settings(depends.jvmTest, moduleJvmSettings("gwt")).
Expand Down Expand Up @@ -221,10 +229,12 @@ lazy val matcherJvm = matcher.jvm.dependsOn(commonJvm)
lazy val matcherExtra = crossProject.in(file("matcher-extra")).
settings(moduleSettings("matcherextra") ++ Seq(
name := "specs2-matcher-extra",
libraryDependencies ++= depends.paradise(scalaVersion.value) ++
Seq("org.scala-lang.modules" %%% "scala-parser-combinators" % "1.0.5")
libraryDependencies ++= depends.paradise(scalaVersion.value)
):_*).
jsSettings(depends.jsTest, moduleJsSettings("matcher-extra")).
jsSettings(depends.jsTest, moduleJsSettings("matcher-extra"),
libraryDependencies ++=
Seq("org.scala-lang.modules" %%% "scala-parser-combinators" % "1.0.5")
).
jvmSettings(depends.jvmTest, moduleJvmSettings("matcher-extra"))

lazy val matcherExtraJs = matcherExtra.js.dependsOn(analysisJs, matcherJs, coreJs % "test->test")
Expand All @@ -241,11 +251,14 @@ lazy val shapeless = crossProject.in(file("shapeless")).
settings(moduleSettings("shapeless") ++
Seq(name := "specs2-shapeless",
libraryDependencies ++=
depends.paradise(scalaVersion.value) ++
Seq("com.chuusai" %%% "shapeless" % shapelessVersion)
depends.paradise(scalaVersion.value)
):_*).
jsSettings(depends.jsTest, moduleJsSettings("shapeless")).
jvmSettings(depends.jvmTest, moduleJvmSettings("shapeless"))
jsSettings(depends.jsTest, moduleJsSettings("shapeless"), libraryDependencies +=
"com.chuusai" %%% "shapeless" % shapelessVersion
).
jvmSettings(depends.jvmTest, moduleJvmSettings("shapeless"), libraryDependencies +=
"com.chuusai" %% "shapeless" % shapelessVersion
)

lazy val shapelessJs = shapeless.js.dependsOn(matcherJs, matcherExtraJs % "test->test")
lazy val shapelessJvm = shapeless.jvm.dependsOn(matcherJvm, matcherExtraJvm % "test->test")
Expand Down Expand Up @@ -277,11 +290,14 @@ lazy val mockJvm = mock.jvm.dependsOn(coreJvm)

lazy val scalacheck = crossProject.in(file("scalacheck")).
settings(
Seq(libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.13.5") ++
moduleSettings("scalacheck") ++
Seq(name := "specs2-scalacheck"):_*).
jsSettings(depends.jsTest, moduleJsSettings("scalacheck")).
jvmSettings(depends.jvmTest, moduleJvmSettings("scalacheck"))
jsSettings(depends.jsTest, moduleJsSettings("scalacheck"), libraryDependencies +=
"org.scalacheck" %%% "scalacheck" % "1.13.5"
).
jvmSettings(depends.jvmTest, moduleJvmSettings("scalacheck"), libraryDependencies +=
"org.scalacheck" %% "scalacheck" % "1.13.5"
)

lazy val scalacheckJs = scalacheck.js.dependsOn(coreJs)
lazy val scalacheckJvm = scalacheck.jvm.dependsOn(coreJvm)
Expand Down