Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
dszeto committed Jul 31, 2014
1 parent af7adbd commit eb2889b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 22 deletions.
22 changes: 2 additions & 20 deletions engines/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ name := "engines"
libraryDependencies ++= Seq(
"com.github.scopt" %% "scopt" % "3.2.0",
"commons-io" % "commons-io" % "2.4",
"org.apache.commons" % "commons-math3" % "3.3",
"org.apache.mahout" % "mahout-core" % "0.9",
"org.apache.spark" %% "spark-core" % "1.0.1" % "provided",
"org.apache.spark" %% "spark-mllib" % "1.0.1"
Expand All @@ -18,26 +19,7 @@ libraryDependencies ++= Seq(
"org.scalanlp" %% "breeze" % "0.7",
"org.scalanlp" %% "breeze-natives" % "0.7",
"org.scalanlp" % "nak" % "1.2.1",
"org.scalatest" %% "scalatest" % "2.2.0" % "test",
"org.apache.commons" % "commons-math3" % "3.3")

resolvers ++= Seq(
"Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/",
"Sonatype Releases" at "https://oss.sonatype.org/content/repositories/releases/"
)

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

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

run in Compile <<= Defaults.runTask(fullClasspath in Compile, mainClass in (Compile, run), runner in (Compile, run))

// use case s if s.endsWith(".class") => MergeStrategy.last due to the folowing:
//[error] (engines/*:assemblyPackageDependency) deduplicate: different file contents found in the following:
//[error] /Users/ckh/.ivy2/cache/xmlpull/xmlpull/jars/xmlpull-1.1.3.1.jar:org/xmlpull/v1/XmlPullParser.class
//[error] /Users/ckh/.ivy2/cache/xpp3/xpp3_min/jars/xpp3_min-1.1.4c.jar:org/xmlpull/v1/XmlPullParser.class
"org.scalatest" %% "scalatest" % "2.2.0" % "test")

mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) =>
{
Expand Down
2 changes: 0 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")

addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.5.1")

0 comments on commit eb2889b

Please sign in to comment.