Permalink
Browse files

As found by Bart, the project doesn't stand alone from a build

  • Loading branch information...
1 parent 1a3dc14 commit 609dc19cab4d3ec470e208eb6dc7b9b9a2737bcb @chris-twiner committed May 9, 2012
Showing with 9 additions and 14 deletions.
  1. +4 −1 .gitignore
  2. +2 −10 project/ScalesXmlRoot.scala
  3. +0 −2 project/Utils.scala
  4. +3 −1 project/plugins.sbt
View
@@ -19,4 +19,7 @@ project/boot/
project/plugins/project/
# Scala-IDE specific
-.scala_dependencies
+.scala_dependencies
+
+# herald uses the directory name, this is a symlink
+ScalesXml/
@@ -2,8 +2,6 @@ import sbt._
import Keys._
import sbt.Package._
import java.util.jar.Attributes.Name._
-import org.ensime.sbt.Plugin.Settings.ensimeConfig
-import org.ensime.sbt.util.SExp._
import Defaults._
import scales.sbtplugins._
@@ -93,14 +91,8 @@ object ScalesXmlRoot extends Build {
)
),
autoCompilerPlugins := false,
- fork in run := true,
- ensimeConfig := sexp(
- key(":compiler-args"), sexp("-Ywarn-dead-code", "-Ywarn-shadowing"),
- key(":formatting-prefs"), sexp(
- key(":spaceBeforeColon"), true
- )
- )
- , parallelExecution in runSecurely := false
+ fork in run := true,
+ parallelExecution in runSecurely := false
) ++ sonatype.settings
// ++ crazyness
View
@@ -4,8 +4,6 @@ import sbt._
import Keys._
import sbt.Package._
import java.util.jar.Attributes.Name._
-import org.ensime.sbt.Plugin.Settings.ensimeConfig
-import org.ensime.sbt.util.SExp._
import Defaults._
import java.io.File
View
@@ -3,7 +3,9 @@ resolvers += "Scales Repo" at "https://scala-scales.googlecode.com/svn/repo"
libraryDependencies ++= Seq(
// from our repo
"org.eclipse.mylyn.wikitext.mediawiki" % "mw.core" % "1.4.0-I20110104-0100-e3x",
- "scales.sbtplugins" % "resources" % "0.1"
+ "scales.sbtplugins" % "resources" % "0.1",
+ // markdown lib
+ "com.tristanhunt" %% "knockoff" % "0.8.0-16"
)
resolvers += Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)

0 comments on commit 609dc19

Please sign in to comment.