Skip to content

Atmosphere 2.3 update #7

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

Merged
merged 1 commit into from
Mar 22, 2014
Merged

Atmosphere 2.3 update #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 12 additions & 14 deletions 2.3/async/scalatra-atmosphere-embedded/project/build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
import sbt._
import Keys._
import org.scalatra.sbt._
import org.scalatra.sbt.PluginKeys._
import com.mojolly.scalate.ScalatePlugin._
import ScalateKeys._
import com.typesafe.sbt.SbtStartScript

object AtmosphereBuild extends Build {
object build extends Build {
val Organization = "com.example"
val Name = "Scalatra Atmosphere Embedded"
val Version = "0.1.0-SNAPSHOT"
val ScalaVersion = "2.10.3"
val ScalatraVersion = "2.3.0-SNAPSHOT"
val ScalatraVersion = "2.3.0.RC1"
val jettyVersion = "9.1.3.v20140225"

lazy val project = Project (
Expand All @@ -25,16 +23,16 @@ object AtmosphereBuild extends Build {
resolvers += "Sonatype OSS Snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/",
resolvers += "Akka Repo" at "http://repo.akka.io/repository",
libraryDependencies ++= Seq(
"org.json4s" %% "json4s-jackson" % "3.1.0",
"org.scalatra" %% "scalatra" % ScalatraVersion,
"org.scalatra" %% "scalatra-scalate" % ScalatraVersion,
"org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
"org.scalatra" %% "scalatra-atmosphere" % ScalatraVersion,
"ch.qos.logback" % "logback-classic" % "1.1.1" % "runtime",
"org.eclipse.jetty" % "jetty-plus" % jettyVersion % "runtime;provided",
"org.eclipse.jetty" % "jetty-webapp" % jettyVersion % "runtime",
"org.eclipse.jetty.websocket" % "websocket-server" % "9.1.3.v20140225" % "runtime;provided",
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "runtime;compile;provided;test" artifacts Artifact("javax.servlet-api", "jar", "jar")
"org.json4s" %% "json4s-jackson" % "3.1.0",
"org.scalatra" %% "scalatra" % ScalatraVersion,
"org.scalatra" %% "scalatra-scalate" % ScalatraVersion,
"org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
"org.scalatra" %% "scalatra-atmosphere" % ScalatraVersion,
"ch.qos.logback" % "logback-classic" % "1.1.1" % "runtime",
"org.eclipse.jetty" % "jetty-plus" % jettyVersion % "compile;provided",
"org.eclipse.jetty" % "jetty-webapp" % jettyVersion % "compile",
"org.eclipse.jetty.websocket" % "websocket-server" % "9.1.3.v20140225" % "compile;provided",
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "compile;provided;test"
),
scalateTemplateConfig in Compile <<= (sourceDirectory in Compile){ base =>
Seq(
Expand Down
2 changes: 1 addition & 1 deletion 2.3/async/scalatra-atmosphere-embedded/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.5")

addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-start-script" % "0.10.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-start-script" % "0.10.0")
2 changes: 1 addition & 1 deletion 2.3/async/scalatra-atmosphere-example/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.1
sbt.version=0.13.1
6 changes: 3 additions & 3 deletions 2.3/async/scalatra-atmosphere-example/project/build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import org.scalatra.sbt._
import com.mojolly.scalate.ScalatePlugin._
import ScalateKeys._

object AtmosphereBuild extends Build {
object build extends Build {
val Organization = "com.example"
val Name = "Scalatra Atmosphere Example"
val Version = "0.2.0-SNAPSHOT"
val ScalaVersion = "2.10.3"
val ScalatraVersion = "2.3.0-SNAPSHOT"
val ScalatraVersion = "2.3.0.RC1"
val json4sversion = "3.2.7"
val jettyVersion = "9.1.3.v20140225"

Expand All @@ -33,7 +33,7 @@ object AtmosphereBuild extends Build {
"org.eclipse.jetty" % "jetty-plus" % jettyVersion % "container;provided",
"org.eclipse.jetty" % "jetty-webapp" % jettyVersion % "container",
"org.eclipse.jetty.websocket" % "websocket-server" % jettyVersion % "container;provided",
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "container;provided;test" artifacts Artifact("javax.servlet-api", "jar", "jar")
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "container;provided;test"
),
scalateTemplateConfig in Compile <<= (sourceDirectory in Compile){ base =>
Seq(
Expand Down