Skip to content

Update to Akka 2.4.2 #5

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.

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

Merged
merged 2 commits into from
Feb 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![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)
[![Dependencies](https://app.updateimpact.com/badge/634276070333485056/akka-http-session.svg?config=compile)](https://app.updateimpact.com/latest/634276070333485056/akka-http-session)

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

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

## Using from SBT

For `akka-http` version `2.0`:
For `akka` version `2.4.2`:

````scala
libraryDependencies += "com.softwaremill.akka-http-session" %% "core" % "0.2.3"
Expand Down
9 changes: 5 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import scalariform.formatter.preferences._

lazy val commonSettings = scalariformSettings ++ Seq(
organization := "com.softwaremill.akka-http-session",
version := "0.2.3",
version := "0.2.4-SNAPSHOT",
scalaVersion := "2.11.7",
scalacOptions ++= Seq("-unchecked", "-deprecation"),
ScalariformKeys.preferences := ScalariformKeys.preferences.value
Expand Down Expand Up @@ -36,7 +36,7 @@ lazy val commonSettings = scalariformSettings ++ Seq(
homepage := Some(new java.net.URL("http://softwaremill.com"))
)

val akkaHttpVersion = "2.0"
val akkaVersion = "2.4.2"

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

Expand All @@ -52,8 +52,9 @@ lazy val core: Project = (project in file("core"))
.settings(
name := "core",
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-http-experimental" % akkaHttpVersion,
"com.typesafe.akka" %% "akka-http-testkit-experimental" % akkaHttpVersion % "test",
"com.typesafe.akka" %% "akka-http-core" % akkaVersion,
"com.typesafe.akka" %% "akka-http-experimental" % akkaVersion,
"com.typesafe.akka" %% "akka-http-testkit" % akkaVersion % "test",
"org.scalacheck" %% "scalacheck" % "1.12.5" % "test",
scalaTest
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ object Example extends App with StrictLogging {
bindingFuture
.flatMap(_.unbind())
.onComplete { _ =>
system.shutdown()
system.terminate()
println("Server stopped")
}
}
Expand Down