Skip to content

Commit a7c8512

Browse files
committed
Merge pull request debasishg#87 from xuwei-k/update-akka-sbt
update akka 2.3.4, sbt 0.13.5
2 parents dedc1fd + 4808654 commit a7c8512

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

project/ScalaRedisProject.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,20 @@ object ScalaRedisProject extends Build
1515
resolvers ++= Seq(akkaRelease, akkaSnapshot, sprayJson)
1616
)
1717

18+
val akkaVersion = "2.3.4"
19+
1820
lazy val coreSettings = commonSettings ++ Seq(
1921
name := "RedisReact",
2022
libraryDependencies :=
2123
Seq(
22-
"com.typesafe.akka" %% "akka-actor" % "2.3.3",
23-
"com.typesafe.akka" %% "akka-slf4j" % "2.3.3" % "provided",
24+
"com.typesafe.akka" %% "akka-actor" % akkaVersion,
25+
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion % "provided",
2426
"commons-pool" % "commons-pool" % "1.6",
2527
"org.slf4j" % "slf4j-api" % "1.7.7" % "provided",
2628
"ch.qos.logback" % "logback-classic" % "1.1.2" % "provided",
2729
"junit" % "junit" % "4.11" % "test",
2830
"org.scalatest" %% "scalatest" % "2.1.6" % "test",
29-
"com.typesafe.akka" %% "akka-testkit" % "2.3.3" % "test",
31+
"com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test",
3032

3133
// Third-party serialization libraries
3234
//"net.liftweb" %% "lift-json" % "2.5.1" % "provided, test",

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.12.4
1+
sbt.version=0.13.5

0 commit comments

Comments
 (0)