Merge branch 'master' of git@github.com:jboner/akka
This commit is contained in:
commit
baabcef4db
2 changed files with 5 additions and 6 deletions
|
|
@ -61,12 +61,12 @@
|
|||
hostname = "localhost"
|
||||
port = 9999
|
||||
connection-timeout = 1000 # in millis (1 sec default)
|
||||
<server>
|
||||
</server>
|
||||
|
||||
<client>
|
||||
reconnect-delay = 5000 # in millis (5 sec default)
|
||||
read-timeout = 10000 # in millis (10 sec default)
|
||||
<client>
|
||||
</client>
|
||||
</remote>
|
||||
|
||||
<storage>
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@
|
|||
import sbt._
|
||||
import sbt.CompileOrder._
|
||||
|
||||
import scala.Array
|
||||
|
||||
import java.util.jar.Attributes
|
||||
import java.util.jar.Attributes.Name._
|
||||
import java.io.File
|
||||
|
|
@ -22,11 +20,12 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
|
|||
val SCALATEST_VERSION = "1.0.1-for-scala-2.8.0.Beta1-with-test-interfaces-0.3-SNAPSHOT"
|
||||
|
||||
// ------------------------------------------------------------
|
||||
val encodingUtf8 = List("-encoding", "UTF-8")
|
||||
|
||||
lazy val deployPath = info.projectPath / "deploy"
|
||||
lazy val distPath = info.projectPath / "dist"
|
||||
|
||||
override def compileOptions = super.compileOptions ++
|
||||
Seq("-deprecation", "-Xmigration", "-Xcheckinit", "-Xstrict-warnings", "-Xwarninit", "-encoding", "utf8").map(x => CompileOption(x))
|
||||
|
||||
override def javaCompileOptions = JavaCompileOption("-Xlint:unchecked") :: super.javaCompileOptions.toList
|
||||
|
||||
def distName = "%s_%s-%s.zip".format(name, buildScalaVersion, version)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue