Skip to content

Commit da2bc27

Browse files
Use cross-compiled play-json; defined joda-time dependency
1 parent d668cca commit da2bc27

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/main/scala/scommons/sbtplugin/project/CommonLibs.scala

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
package scommons.sbtplugin.project
22

33
import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
4+
import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport.scalaJSVersion
45
import sbt._
56

67
trait CommonLibs {
78

89
val akkaVersion = "2.6.14"
910
val playVer = "2.8.8" // should be the same as Play sbt-plugin version (see plugins.sbt)
1011
val scaldiPlayVer = "0.6.1"
11-
val playJsonVer = "2.8.1"
12+
val playJsonVer: String =
13+
if (scalaJSVersion.startsWith("0.6")) "2.8.1"
14+
else "2.9.0"
1215
val playWsVer = "2.0.8"
16+
val jodaTimeVer = "2.10.5"
1317

1418
//////////////////////////////////////////////////////////////////////////////
1519
// jvm dependencies
@@ -19,6 +23,8 @@ trait CommonLibs {
1923
lazy val playJson = Def.setting("com.typesafe.play" %% "play-json" % playJsonVer)
2024
lazy val playWs = Def.setting("com.typesafe.play" %% "play-ahc-ws-standalone" % playWsVer)
2125

26+
lazy val jodaTime = Def.setting("joda-time" % "joda-time" % jodaTimeVer)
27+
2228
lazy val logback = Def.setting("ch.qos.logback" % "logback-classic" % "1.1.7")
2329
lazy val slf4jApi = Def.setting("org.slf4j" % "slf4j-api" % "1.7.12")
2430
lazy val jclOverSlf4j = Def.setting("org.slf4j" % "jcl-over-slf4j" % "1.7.12")

0 commit comments

Comments
 (0)