Skip to content

Commit 445f26a

Browse files
committed
Merge pull request #5 from kciesielski/akka-2.4.2
Update to Akka 2.4.2
2 parents 8844a51 + 59d10df commit 445f26a

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.softwaremill.akka-http-session/core_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.softwaremill.akka-http-session/core_2.11)
66
[![Dependencies](https://app.updateimpact.com/badge/634276070333485056/akka-http-session.svg?config=compile)](https://app.updateimpact.com/latest/634276070333485056/akka-http-session)
77

8-
[akka-http](http://doc.akka.io/docs/akka-stream-and-http-experimental/2.0-M1/scala/http/) is an experimental Akka
8+
[akka-http](http://doc.akka.io/docs/akka/2.4.2/scala/http/index.html) is an Akka
99
module, originating from [spray.io](http://spray.io), for building *reactive* REST services with an elegant DSL.
1010

1111
`akka-http` is a great toolkit for building backends for single-page or mobile applications. In almost all apps there
@@ -349,7 +349,7 @@ stored in Rails
349349

350350
## Using from SBT
351351

352-
For `akka-http` version `2.0`:
352+
For `akka` version `2.4.2`:
353353

354354
````scala
355355
libraryDependencies += "com.softwaremill.akka-http-session" %% "core" % "0.2.3"

build.sbt

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import scalariform.formatter.preferences._
22

33
lazy val commonSettings = scalariformSettings ++ Seq(
44
organization := "com.softwaremill.akka-http-session",
5-
version := "0.2.3",
5+
version := "0.2.4-SNAPSHOT",
66
scalaVersion := "2.11.7",
77
scalacOptions ++= Seq("-unchecked", "-deprecation"),
88
ScalariformKeys.preferences := ScalariformKeys.preferences.value
@@ -36,7 +36,7 @@ lazy val commonSettings = scalariformSettings ++ Seq(
3636
homepage := Some(new java.net.URL("http://softwaremill.com"))
3737
)
3838

39-
val akkaHttpVersion = "2.0"
39+
val akkaVersion = "2.4.2"
4040

4141
val scalaTest = "org.scalatest" %% "scalatest" % "2.2.5" % "test"
4242

@@ -52,8 +52,9 @@ lazy val core: Project = (project in file("core"))
5252
.settings(
5353
name := "core",
5454
libraryDependencies ++= Seq(
55-
"com.typesafe.akka" %% "akka-http-experimental" % akkaHttpVersion,
56-
"com.typesafe.akka" %% "akka-http-testkit-experimental" % akkaHttpVersion % "test",
55+
"com.typesafe.akka" %% "akka-http-core" % akkaVersion,
56+
"com.typesafe.akka" %% "akka-http-experimental" % akkaVersion,
57+
"com.typesafe.akka" %% "akka-http-testkit" % akkaVersion % "test",
5758
"org.scalacheck" %% "scalacheck" % "1.12.5" % "test",
5859
scalaTest
5960
)

example/src/main/scala/com/softwaremill/example/Example.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ object Example extends App with StrictLogging {
8282
bindingFuture
8383
.flatMap(_.unbind())
8484
.onComplete { _ =>
85-
system.shutdown()
85+
system.terminate()
8686
println("Server stopped")
8787
}
8888
}

0 commit comments

Comments
 (0)