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

Update akka sbt plugin

Browse source 
- compatible with both 1.x and 2.x microkernels
- fix sbt deprecation warnings
This commit is contained in:
Peter Vlugter 2011-12-15 17:23:40 +13:00
parent 37efb72f22
commit 1d8bd1b67f
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -95,7 +95,9 @@ object AkkaKernelPlugin extends Plugin {
} }
def isKernelProject(dependencies: Seq[ModuleID]): Boolean = { def isKernelProject(dependencies: Seq[ModuleID]): Boolean = {
dependencies.exists(moduleId ⇒ moduleId.organization == "se.scalablesolutions.akka" && moduleId.name == "akka-kernel") dependencies.exists { d ⇒
(d.organization == "com.typesafe.akka" || d.organization == "se.scalablesolutions.akka") && d.name == "akka-kernel"
}
} }
private def defaultConfigSourceDirs = (sourceDirectory, unmanagedResourceDirectories) map { (src, resources) ⇒ private def defaultConfigSourceDirs = (sourceDirectory, unmanagedResourceDirectories) map { (src, resources) ⇒
@ -128,7 +130,7 @@ object AkkaKernelPlugin extends Plugin {
|AKKA_CLASSPATH="$AKKA_HOME/lib/*:$AKKA_HOME/config" |AKKA_CLASSPATH="$AKKA_HOME/lib/*:$AKKA_HOME/config"
|JAVA_OPTS="%s" |JAVA_OPTS="%s"
| |
|java $JAVA_OPTS -cp "$AKKA_CLASSPATH" -Dakka.home="$AKKA_HOME" %s |java $JAVA_OPTS -cp "$AKKA_CLASSPATH" -Dakka.home="$AKKA_HOME" %s "$@"
|""".stripMargin.format(jvmOptions, mainClass) |""".stripMargin.format(jvmOptions, mainClass)
private def distBatScript = private def distBatScript =
@ -137,7 +139,7 @@ object AkkaKernelPlugin extends Plugin {
|set AKKA_CLASSPATH=%%AKKA_HOME%%\lib\*;%%AKKA_HOME%%\config |set AKKA_CLASSPATH=%%AKKA_HOME%%\lib\*;%%AKKA_HOME%%\config
|set JAVA_OPTS=%s |set JAVA_OPTS=%s
| |
|java %%JAVA_OPTS%% -cp "%%AKKA_CLASSPATH%%" -Dakka.home="%%AKKA_HOME%%" %s |java %%JAVA_OPTS%% -cp "%%AKKA_CLASSPATH%%" -Dakka.home="%%AKKA_HOME%%" %s %%*
|""".stripMargin.format(jvmOptions, mainClass) |""".stripMargin.format(jvmOptions, mainClass)
private def setExecutable(target: File, executable: Boolean): Option[String] = { private def setExecutable(target: File, executable: Boolean): Option[String] = {
@ -194,9 +196,9 @@ object AkkaKernelPlugin extends Plugin {
private def projectInfo(projectRef: ProjectRef, project: ResolvedProject, buildStruct: BuildStructure, state: State, private def projectInfo(projectRef: ProjectRef, project: ResolvedProject, buildStruct: BuildStructure, state: State,
allProjects: Map[ProjectRef, ResolvedProject]): SubProjectInfo = { allProjects: Map[ProjectRef, ResolvedProject]): SubProjectInfo = {
def optionalSetting[A](key: ScopedSetting[A]) = key in projectRef get buildStruct.data def optionalSetting[A](key: SettingKey[A]) = key in projectRef get buildStruct.data
def setting[A](key: ScopedSetting[A], errorMessage: ⇒ String) = { def setting[A](key: SettingKey[A], errorMessage: ⇒ String) = {
optionalSetting(key) getOrElse { optionalSetting(key) getOrElse {
logger(state).error(errorMessage); logger(state).error(errorMessage);
throw new IllegalArgumentException() throw new IllegalArgumentException()
@ -204,7 +206,7 @@ object AkkaKernelPlugin extends Plugin {
} }
def evaluateTask[T](taskKey: sbt.Project.ScopedKey[sbt.Task[T]]) = { def evaluateTask[T](taskKey: sbt.Project.ScopedKey[sbt.Task[T]]) = {
EvaluateTask.evaluateTask(buildStruct, taskKey, state, projectRef, false, EvaluateTask.SystemProcessors) EvaluateTask(buildStruct, taskKey, state, projectRef).map(_._2)
} }
val projDeps: Seq[ModuleID] = evaluateTask(Keys.projectDependencies) match { val projDeps: Seq[ModuleID] = evaluateTask(Keys.projectDependencies) match {