raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Update to sbt 0.11.2

Browse source
This commit is contained in:
Peter Vlugter 2011-12-08 17:05:01 +13:00
parent 738857ccc2
commit 9848fdc706
4 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

27
project/AkkaBuild.scala
View file

@ -5,14 +5,11 @@
package akka
import sbt._
import Keys._
import sbt.Keys._
import com.typesafe.sbtmultijvm.MultiJvmPlugin
import com.typesafe.sbtmultijvm.MultiJvmPlugin.{ MultiJvm, extraOptions, jvmOptions, scalatestOptions }
import com.typesafe.sbtscalariform.ScalariformPlugin
import MultiJvmPlugin.{ MultiJvm, extraOptions, jvmOptions, scalatestOptions }
import ScalariformPlugin.{ format, formatPreferences, formatSourceDirectories }
import com.typesafe.sbtscalariform.ScalariformPlugin.ScalariformKeys
import java.lang.Boolean.getBoolean
object AkkaBuild extends Build {
@ -225,14 +222,14 @@ object AkkaBuild extends Build {
dependencies = Seq(actor),
settings = defaultSettings
)
lazy val helloSample = Project(
id = "akka-sample-hello",
base = file("akka-samples/akka-sample-hello"),
dependencies = Seq(actor),
settings = defaultSettings
)
lazy val tutorials = Project(
id = "akka-tutorials",
base = file("akka-tutorials"),
@ -263,7 +260,7 @@ object AkkaBuild extends Build {
settings = defaultSettings ++ Seq(
unmanagedSourceDirectories in Test <<= baseDirectory { _ ** "code" get },
libraryDependencies ++= Dependencies.docs,
formatSourceDirectories in Test <<= unmanagedSourceDirectories in Test
unmanagedSourceDirectories in ScalariformKeys.format in Test <<= unmanagedSourceDirectories in Test
)
)
@ -335,9 +332,9 @@ object AkkaBuild extends Build {
testOptions in Test += Tests.Argument("-oF")
)
lazy val formatSettings = ScalariformPlugin.settings ++ Seq(
formatPreferences in Compile := formattingPreferences,
formatPreferences in Test := formattingPreferences
lazy val formatSettings = ScalariformPlugin.scalariformSettings ++ Seq(
ScalariformKeys.preferences in Compile := formattingPreferences,
ScalariformKeys.preferences in Test := formattingPreferences
)
def formattingPreferences = {
@ -348,9 +345,9 @@ object AkkaBuild extends Build {
.setPreference(AlignSingleLineCaseStatements, true)
}
lazy val multiJvmSettings = MultiJvmPlugin.settings ++ inConfig(MultiJvm)(ScalariformPlugin.formatSettings) ++ Seq(
compileInputs in MultiJvm <<= (compileInputs in MultiJvm) dependsOn (format in MultiJvm),
formatPreferences in MultiJvm := formattingPreferences
lazy val multiJvmSettings = MultiJvmPlugin.settings ++ inConfig(MultiJvm)(ScalariformPlugin.scalariformSettings) ++ Seq(
compileInputs in MultiJvm <<= (compileInputs in MultiJvm) dependsOn (ScalariformKeys.format in MultiJvm),
ScalariformKeys.preferences in MultiJvm := formattingPreferences
)
// reStructuredText docs

2
project/Unidoc.scala
View file

@ -42,7 +42,7 @@ object Unidoc {
}
def unidocTask: Initialize[Task[File]] = {
(compilers, cacheDirectory, unidocSources, unidocClasspath, unidocDirectory, scaladocOptions in Compile, streams) map {
(compilers, cacheDirectory, unidocSources, unidocClasspath, unidocDirectory, scalacOptions in doc, streams) map {
(compilers, cache, sources, classpath, target, options, s) => {
val scaladoc = new Scaladoc(100, compilers.scalac)
scaladoc.cached(cache / "unidoc", "main", sources, classpath, target, options, s.log)

2
project/build.properties
View file

@ -1 +1 @@
sbt.version=0.11.0
sbt.version=0.11.2

5
project/plugins.sbt
View file

@ -3,10 +3,11 @@ resolvers += Classpaths.typesafeResolver
addSbtPlugin("com.typesafe.sbtmultijvm" % "sbt-multi-jvm" % "0.1.7")
addSbtPlugin("com.typesafe.sbtscalariform" % "sbt-scalariform" % "0.1.4")
addSbtPlugin("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.3.1")
resolvers ++= Seq(
"less is" at "http://repo.lessis.me",
"coda" at "http://repo.codahale.com")
addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.0")
addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.1")