diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-08-01 15:26:31 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-08-01 15:26:31 -0700 |
| commit | a0b7865037d6ba100abef7a1f69669d0d9b3febc (patch) | |
| tree | cb315bdd7dba532e981ddca9495c9cb5714bf8ac /project | |
| parent | ecb8b69fa088764c109c74153f05ba8d2fc698d1 (diff) | |
| parent | 3f5d7b5d1154b5661cff8741efc49c70c76b3f47 (diff) | |
| download | spark-a0b7865037d6ba100abef7a1f69669d0d9b3febc.tar.gz spark-a0b7865037d6ba100abef7a1f69669d0d9b3febc.tar.bz2 spark-a0b7865037d6ba100abef7a1f69669d0d9b3febc.zip | |
Merge pull request #75 from ijuma/scala-2.9
Workaround for scalac bug and publishTo configuration
Diffstat (limited to 'project')
| -rw-r--r-- | project/DepJar.scala | 4 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/project/DepJar.scala b/project/DepJar.scala index 1d54005690..6ca00423be 100644 --- a/project/DepJar.scala +++ b/project/DepJar.scala @@ -90,7 +90,7 @@ object DepJarPlugin extends Plugin { descendants x relativeTo(base) } - lazy val depJarSettings = inConfig(DepJar)(Seq( + lazy val depJarSettings: Seq[Setting[_]] = inConfig(DepJar)(Seq( depJar <<= packageBin.identity, packageBin <<= assemblyTask, jarName <<= (name, version) { (name, version) => name + "-dep-" + version + ".jar" }, @@ -105,4 +105,4 @@ object DepJarPlugin extends Plugin { Seq( depJar <<= (depJar in DepJar).identity ) -}
\ No newline at end of file +} diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 456c0da0db..3f37da5139 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -22,6 +22,7 @@ object SparkBuild extends Build { retrieveManaged := true, transitiveClassifiers in Scope.GlobalScope := Seq("sources"), testListeners <<= target.map(t => Seq(new eu.henkelmann.sbt.JUnitXmlTestsListener(t.getAbsolutePath))), + publishTo <<= baseDirectory { base => Some(Resolver.file("Local", base / "target" / "maven" asFile)(Patterns(true, Resolver.mavenStyleBasePattern))) }, libraryDependencies ++= Seq( "org.eclipse.jetty" % "jetty-server" % "7.4.2.v20110526", "org.scalatest" % "scalatest_2.9.0" % "1.6.1" % "test", |