From 501e9663e01a1a8b5ef08e51e0d03858b6865bf3 Mon Sep 17 00:00:00 2001
From: Etienne Kneuss <colder@php.net>
Date: Fri, 16 Aug 2013 15:18:01 +0200
Subject: [PATCH] Upgrade to akka-actors 2.2.0, include configuration in the
classpath
---
build.sbt | 2 +-
project/Build.scala | 4 ++--
src/main/resources/application.conf | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 src/main/resources/application.conf
diff --git a/build.sbt b/build.sbt
index 359c39a0b..7e9d71fef 100644
--- a/build.sbt
+++ b/build.sbt
@@ -25,7 +25,7 @@ resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/release
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-compiler" % "2.10.2",
"org.scalatest" %% "scalatest" % "1.9.1" excludeAll(ExclusionRule(organization="org.scala-lang")),
- "com.typesafe.akka" %% "akka-actor" % "2.1.4"
+ "com.typesafe.akka" %% "akka-actor" % "2.2.0"
)
fork in run := true
diff --git a/project/Build.scala b/project/Build.scala
index 02a430d76..6cead39eb 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -75,7 +75,7 @@ object Leon extends Build {
}
def genRunnerTask(taskName: String, file: File, name: String, mainClass: String) = {
- TaskKey[Unit](taskName, "Generate the " + name + " Bash script") <<= (streams, setupScriptTask) map { (s, cps) =>
+ TaskKey[Unit](taskName, "Generate the " + name + " Bash script") <<= (streams, setupScriptTask, resourceDirectory in Compile) map { (s, cps, res) =>
try {
// Paths discovery
if(file.exists) {
@@ -89,7 +89,7 @@ object Leon extends Build {
fw.write("#!/bin/bash --posix" + nl)
fw.write("SCALACLASSPATH=\"")
- fw.write(cps.mkString(":"))
+ fw.write((res.getAbsolutePath +: cps).mkString(":"))
fw.write("\"" + nl + nl)
fw.write("source "+setupScriptFile.getAbsolutePath()+nl)
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
new file mode 100644
index 000000000..51fdc6c2c
--- /dev/null
+++ b/src/main/resources/application.conf
@@ -0,0 +1,3 @@
+akka {
+ "log-dead-letters-during-shutdown": false
+}
--
GitLab