Skip to content
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.

Sign up for GitHub

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

Update versions #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update versions #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7134fc6
Update versions.
FranklinChen Feb 27, 2015
507d965
Fix typo in source file name.
FranklinChen Feb 27, 2015
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
0 .../src/main/scala/FibanacciSubscriber.scala → .../src/main/scala/FibonacciSubscriber.scala
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.github.retronym.SbtOneJar
object BuildSettings {
val buildOrganization = "bryan.codes"
val buildVersion = "0.1"
val buildScalaVersion = "2.11.2"
val buildScalaVersion = "2.11.5"

val buildSettings = Defaults.defaultSettings ++ Seq (
organization := buildOrganization,
Expand All @@ -25,12 +25,12 @@ object Dependencies {
val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion
val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion

val akkaHttp = "com.typesafe.akka" %% "akka-http-core-experimental" % "1.0-M2"
val akkaStream = "com.typesafe.akka" %% "akka-stream-experimental" % "1.0-M2"
val akkaHttp = "com.typesafe.akka" %% "akka-http-core-experimental" % "1.0-M4"
val akkaStream = "com.typesafe.akka" %% "akka-stream-experimental" % "1.0-M4"

val playJson = "com.typesafe.play" %% "play-json" % "2.3.7"
val scalatest = "org.scalatest" %% "scalatest" % "2.2.0" % "test"
val scalaAsync = "org.scala-lang.modules" %% "scala-async" % "0.9.2"
val playJson = "com.typesafe.play" %% "play-json" % "2.3.8"
val scalatest = "org.scalatest" %% "scalatest" % "2.2.4" % "test"
val scalaAsync = "org.scala-lang.modules" %% "scala-async" % "0.9.3"

val akkaDependencies = Seq(akkaActor, akkaSlf4j, akkaTestkit, akkaHttp, akkaStream)
val miscDependencies = Seq(playJson, scalaAsync)
Expand Down Expand Up @@ -58,4 +58,4 @@ object AkkaHttpStreamExample extends Build {
.settings ( resolvers ++= Seq(typesafeRepo) )
.settings ( libraryDependencies ++= Dependencies.allDependencies )
.settings ( scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature") )
}
}