Fix cross build

lpiepiora · mauricio · commit 82541265280b · 2014-05-24T10:31:34.000-03:00
diff --git a/project/Build.scala b/project/Build.scala
@@ -19,7 +19,7 @@ object ProjectBuild extends Build {
     base = file(commonName),
     settings = Configuration.baseSettings ++ Seq(
       name := commonName,
-      libraryDependencies := Configuration.commonDependencies
+      libraryDependencies ++= Configuration.commonDependencies
     )
   )
 
@@ -74,7 +74,6 @@ object Configuration {
         :+ "-feature"
     ,
     scalacOptions in doc := Seq("-doc-external-doc:scala=http://www.scala-lang.org/archives/downloads/distrib/files/nightly/docs/library/"),
-    scalaVersion := projectScalaVersion,
     crossScalaVersions := Seq(projectScalaVersion, "2.10.4"),
     javacOptions := Seq("-source", "1.6", "-target", "1.6", "-encoding", "UTF8"),
     organization := "com.github.mauricio",

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ object ProjectBuild extends Build {`
`19`	`19`	`base = file(commonName),`
`20`	`20`	`settings = Configuration.baseSettings ++ Seq(`
`21`	`21`	`name := commonName,`
`22`		`- libraryDependencies := Configuration.commonDependencies`
	`22`	`+ libraryDependencies ++= Configuration.commonDependencies`
`23`	`23`	`)`
`24`	`24`	`)`
`25`	`25`
`@@ -74,7 +74,6 @@ object Configuration {`
`74`	`74`	`:+ "-feature"`
`75`	`75`	`,`
`76`	`76`	`scalacOptions in doc := Seq("-doc-external-doc:scala=http://www.scala-lang.org/archives/downloads/distrib/files/nightly/docs/library/"),`
`77`		`- scalaVersion := projectScalaVersion,`
`78`	`77`	`crossScalaVersions := Seq(projectScalaVersion, "2.10.4"),`
`79`	`78`	`javacOptions := Seq("-source", "1.6", "-target", "1.6", "-encoding", "UTF8"),`
`80`	`79`	`organization := "com.github.mauricio",`