Skip to content

Commit

Permalink
2015 updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Cruise committed May 22, 2015
1 parent 6169a0d commit 994a5d3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.idea/
*.iml
target/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ http://akka.io/
http://spray.io/

Spray HTTP - Directives
http://spray.io/documentation/1.2.1/spray-routing/predefined-directives-alphabetically/
http://spray.io/documentation/1.2.2/spray-routing/predefined-directives-alphabetically/

Spray-JSON
https://github.com/spray/spray-json
12 changes: 6 additions & 6 deletions mvn-skeleton/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

<groupId>com.cluonflux</groupId>
<artifactId>polyglot-scala-workshop</artifactId>
<version>0.1-SNAPSHOT</version>
<version>0.2-SNAPSHOT</version>

<properties>
<scala.version>2.10.4</scala.version>
<scala.binary.version>2.10</scala.binary.version>
<akka.version>2.3.2</akka.version>
<scala.version>2.11.6</scala.version>
<scala.binary.version>2.11</scala.binary.version>
<akka.version>2.3.11</akka.version>
</properties>

<dependencies>
Expand All @@ -33,10 +33,10 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.1.6</version>
<version>3.2.0</version>
</plugin>
</plugins>
</build>


</project>
</project>
10 changes: 6 additions & 4 deletions sbt-skeleton/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
scalaVersion := "2.11.6"

libraryDependencies := Seq(
"com.typesafe.akka" %% "akka-actor" % "2.3.2",
"io.spray" % "spray-can" % "1.3.1",
"io.spray" % "spray-routing" % "1.3.1",
"io.spray" %% "spray-json" % "1.2.6"
"com.typesafe.akka" %% "akka-actor" % "2.3.11",
"io.spray" %% "spray-can" % "1.3.3",
"io.spray" %% "spray-routing" % "1.3.3",
"io.spray" %% "spray-json" % "1.3.2"
)

0 comments on commit 994a5d3

Please sign in to comment.