Permalink
Browse files

Reformatted text and added Easymock

  • Loading branch information...
1 parent a8c4cc9 commit 8813c7911536859248c26365fea5489c509c99f0 @musk committed Mar 10, 2011
View
@@ -10,6 +10,6 @@ sbt.version=0.7.4
build.scala.versions=2.7.7
project.organization=de.element34
project.initialize=false
-project.version=0.7.1-SNAPSHOT
+project.version=0.8.0-SNAPSHOT
eclipse.project.nature=scala
#include.project=true
@@ -29,14 +29,14 @@
import sbt._
import de.element34.sbteclipsify._
-class SbtEclipsifyPluginProject(info: ProjectInfo) extends PluginProject(info) with Eclipsify with posterous.Publish {
+class SbtEclipsifyPluginProject(info: ProjectInfo) extends PluginProject(info) with Eclipsify /*with posterous.Publish*/ {
override def compileOptions = super.compileOptions ++ (Unchecked :: Deprecation :: Nil)
override def mainResources = super.mainResources +++ "NOTICE" +++ "LICENSE" +++ (path("licenses") * "*")
val scalaSnapshotToolsRepository = "Scala Tools Repository" at "http://nexus.scala-tools.org/content/repositories/snapshots/"
- lazy val scalaTest = "org.scalatest" % "scalatest" % "1.2" % "test"
-
+ lazy val scalaTest = "org.scalatest" % "scalatest" % "1.1" % "test"
+ lazy val easyMock = "org.easymock" % "easymock" % "3.0" % "test"
override def managedStyle = ManagedStyle.Maven
val credPath = Path.userHome / ".credentials"
@@ -32,5 +32,5 @@ import sbt._
class SbtEclipsifyPlugin(info: ProjectInfo) extends PluginDefinition(info) {
lazy val eclipse = "de.element34" % "sbt-eclipsify" % "0.7.1-SNAPSHOT"
val t_repo = "t_repo" at "http://tristanhunt.com:8081/content/groups/public/"
- lazy val posterous = "net.databinder" % "posterous-sbt" % "0.1.4"
+// lazy val posterous = "net.databinder" % "posterous-sbt" % "0.1.6"
}
@@ -59,26 +59,23 @@ case class ClasspathEntry(kind: Kind, path: String, srcPath: Option[String], out
*/
def mkString(sep: String): String = {
sep +
- "<classpathentry kind=\"" + kind.name + "\"" +
- " path=\"" + path + "\"" +
- writeOptionalPath("sourcepath", srcPath) +
- writeOptionalPath("output", outputPath) +
- filter.mkString + (
- if(attributes.isEmpty)
- " />"
- else {
- def mkAttribute(item: Tuple2[String, String]) = {
- "<attribute name=\"" + item._1 + "\" value=\"" + item._2 + "\" />"
- }
- val attrstr = ("" /: attributes.map(mkAttribute))(_ + _)
- ">\n<attributes>\n"+ attrstr + "\n</attributes>\n</classpathentry>"
- }
- )
+ "<classpathentry kind=\"" + kind.name + "\"" +
+ " path=\"" + path + "\"" +
+ writeOptionalPath("sourcepath", srcPath) +
+ writeOptionalPath("output", outputPath) +
+ filter.mkString + (if (attributes.isEmpty) " />"
+ else {
+ def mkAttribute(item: Tuple2[String, String]) = {
+ "<attribute name=\"" + item._1 + "\" value=\"" + item._2 + "\" />"
+ }
+ val attrstr = ("" /: attributes.map(mkAttribute))(_ + _)
+ ">\n<attributes>\n" + attrstr + "\n</attributes>\n</classpathentry>"
+ })
}
/** returns the sourcepath as a string when specified */
def writeOptionalPath(attributeName: String, path: Option[String]): String = {
path match {
- case Some(text) => " %s=\"%s\"".format(attributeName,text)
+ case Some(text) => " %s=\"%s\"".format(attributeName, text)
case None => ""
}
}
Oops, something went wrong.

0 comments on commit 8813c79

Please sign in to comment.