Merge pull request #19 from hseeberger/upgrades

adamw · web-flow · commit a2459226ccfd · 2016-08-22T20:22:31.000+02:00
Upgrade to Akka 2.4.9 and sbt 0.13.12
diff --git a/build.sbt b/build.sbt
@@ -38,7 +38,7 @@ lazy val commonSettings = scalariformSettings ++ Seq(
   homepage := Some(new java.net.URL("http://softwaremill.com"))
 )
 
-val akkaVersion = "2.4.4"
+val akkaVersion = "2.4.9"
 
 val scalaTest = "org.scalatest" %% "scalatest" % "2.2.6" % "test"
 
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.11
+sbt.version=0.13.12

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ lazy val commonSettings = scalariformSettings ++ Seq(`
`38`	`38`	`homepage := Some(new java.net.URL("http://softwaremill.com"))`
`39`	`39`	`)`
`40`	`40`
`41`		`-val akkaVersion = "2.4.4"`
	`41`	`+val akkaVersion = "2.4.9"`
`42`	`42`
`43`	`43`	`val scalaTest = "org.scalatest" %% "scalatest" % "2.2.6" % "test"`
`44`	`44`