Skip to content

Commit

Permalink
Remove Scalariform and fix SXR
Browse files Browse the repository at this point in the history
  • Loading branch information
dszeto committed May 20, 2014
1 parent a8917d6 commit a08c1c4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
9 changes: 2 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,10 @@ scalacOptions in (ThisBuild, Test) ++= Seq("-Yrangepos")
javacOptions in ThisBuild ++= Seq("-source", "1.6", "-target", "1.6",
"-Xlint:deprecation", "-Xlint:unchecked")

def sharedSettings = scalariformSettings ++ Seq(
ScalariformKeys.preferences := ScalariformKeys.preferences.value
.setPreference(AlignSingleLineCaseStatements, true))

lazy val root = project in file(".") aggregate(
core,
engines)

lazy val core = project in file("core") settings(sharedSettings: _*)
lazy val core = project in file("core")

lazy val engines = project in file("engines") settings(
sharedSettings: _*) dependsOn(core)
lazy val engines = project in file("engines") dependsOn(core)
10 changes: 8 additions & 2 deletions core/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@ libraryDependencies ++= Seq(
"com.typesafe" % "config" % "1.2.1",
"com.typesafe.akka" %% "akka-contrib" % "2.3.2",
"com.typesafe.akka" %% "akka-testkit" % "2.3.2",
"org.clapper" %% "grizzled-slf4j" % "1.0.2",
"org.mongodb" %% "casbah" % "2.7.2",
"org.scalatest" %% "scalatest" % "2.1.6" % "test")

addCompilerPlugin("org.scala-sbt.sxr" %% "sxr" % "0.3.0")

scalacOptions <<= (scalacOptions, scalaSource in Compile) map { (options, base) =>
options :+ ("-P:sxr:base-directory:" + base.getAbsolutePath)
}

resolvers += Resolver.url(
"Typesafe Releases",
url("http:https://repo.typesafe.com/typesafe/ivy-releases"))(
Resolver.ivyStylePatterns)

addCompilerPlugin("org.scala-sbt.sxr" %% "sxr" % "0.3.0")
1 change: 0 additions & 1 deletion project/plugins.sbt

This file was deleted.

0 comments on commit a08c1c4

Please sign in to comment.