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

Update build and sbt plugin to sbt 0.12.1

Browse source
This commit is contained in:
Peter Vlugter 2012-11-06 12:30:31 +13:00
parent 8eec825f18
commit 94060d6132
6 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-sbt-plugin/sample/project/Build.scala
View file

@ -7,7 +7,7 @@ import akka.sbt.AkkaKernelPlugin.{ Dist, outputDirectory, distJvmOptions}
object HelloKernelBuild extends Build { object HelloKernelBuild extends Build {
val Organization = "akka.sample" val Organization = "akka.sample"
val Version = "2.2-SNAPSHOT" val Version = "2.2-SNAPSHOT"
val ScalaVersion = "2.10.0-M6" val ScalaVersion = "2.10.0-RC1"
lazy val HelloKernel = Project( lazy val HelloKernel = Project(
id = "hello-kernel", id = "hello-kernel",
@ -52,7 +52,7 @@ object Dependency {
val Akka = "2.2-SNAPSHOT" val Akka = "2.2-SNAPSHOT"
} }
val akkaKernel = "com.typesafe.akka" % "akka-kernel" % V.Akka val akkaKernel = "com.typesafe.akka" %% "akka-kernel" % V.Akka cross CrossVersion.full
val akkaSlf4j = "com.typesafe.akka" % "akka-slf4j" % V.Akka val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % V.Akka cross CrossVersion.full
val logback = "ch.qos.logback" % "logback-classic" % "1.0.0" val logback = "ch.qos.logback" % "logback-classic" % "1.0.0"
} }

2
akka-sbt-plugin/sample/project/build.properties
View file

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

2
akka-sbt-plugin/sample/project/plugins.sbt
View file

@ -1,3 +1 @@
resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/"
addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.2-SNAPSHOT") addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.2-SNAPSHOT")

4
akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
View file

@ -59,7 +59,7 @@ object AkkaKernelPlugin extends Plugin {
(distConfig, sourceDirectory, crossTarget, dependencyClasspath, projectDependencies, allDependencies, buildStructure, state) map { (conf, src, tgt, cp, projDeps, allDeps, buildStruct, st) ⇒ (distConfig, sourceDirectory, crossTarget, dependencyClasspath, projectDependencies, allDependencies, buildStructure, state) map { (conf, src, tgt, cp, projDeps, allDeps, buildStruct, st) ⇒
if (isKernelProject(allDeps)) { if (isKernelProject(allDeps)) {
val log = logger(st) val log = st.log
val distBinPath = conf.outputDirectory / "bin" val distBinPath = conf.outputDirectory / "bin"
val distConfigPath = conf.outputDirectory / "config" val distConfigPath = conf.outputDirectory / "config"
val distDeployPath = conf.outputDirectory / "deploy" val distDeployPath = conf.outputDirectory / "deploy"
@ -201,7 +201,7 @@ object AkkaKernelPlugin extends Plugin {
def setting[A](key: SettingKey[A], errorMessage: ⇒ String) = { def setting[A](key: SettingKey[A], errorMessage: ⇒ String) = {
optionalSetting(key) getOrElse { optionalSetting(key) getOrElse {
logger(state).error(errorMessage); state.log.error(errorMessage);
throw new IllegalArgumentException() throw new IllegalArgumentException()
} }
} }

2
project/AkkaBuild.scala
View file

@ -274,7 +274,7 @@ object AkkaBuild extends Build {
publishMavenStyle := false, // SBT Plugins should be published as Ivy publishMavenStyle := false, // SBT Plugins should be published as Ivy
publishTo <<= Publish.akkaPluginPublishTo, publishTo <<= Publish.akkaPluginPublishTo,
scalacOptions in Compile := Seq("-encoding", "UTF-8", "-deprecation", "-unchecked"), scalacOptions in Compile := Seq("-encoding", "UTF-8", "-deprecation", "-unchecked"),
scalaVersion := "2.9.1", scalaVersion := "2.9.2",
scalaBinaryVersion <<= scalaVersion scalaBinaryVersion <<= scalaVersion
) )
) )

2
project/build.properties
View file

@ -1 +1 @@
sbt.version=0.12.0 sbt.version=0.12.1