10000 Removed override of scala version in lift project. · randomcoding/scala-utilities@96623e3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 96623e3

Browse files
randomcoderrandomcoder
committed
Removed override of scala version in lift project.
This is now handled by the cross build.
1 parent deea537 commit 96623e3

File tree

1 file changed

+40
-41
lines changed

1 file changed

+40
-41
lines changed

‎project/ProjectBuild.scala

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
1-
import sbt._
2-
import Keys._
3-
4-
import com.typesafe.sbteclipse.core.EclipsePlugin._
5-
6-
object ProjectBuild extends Build {
7-
import BuildSettings._
8-
import ShellPrompt._
9-
import Dependencies._
10-
11-
lazy val root = Project("root",
12-
file("."),
13-
settings = buildSettings ++ Unidoc.settings ++ Seq (
14-
scaladocOptions := Seq(),
15-
// Disable publish and publish-local for empty root project
16-
publish := {},
17-
publishLocal := {}
18-
)
19-
) aggregate(coreProject, liftProject)
20-
21-
lazy val coreProject: Project = Project("core",
22-
file("scala-utilities-core"),
23-
delegates = root :: Nil,
24-
settings = buildSettings ++ Seq(libraryDependencies ++= coreProjectDeps,
25-
name := "scala-utilities-core"
26-
)
27-
)
28-
29-
lazy val liftProject: Project = Project("lift",
30-
file("scala-utilities-lift"),
31-
settings = buildSettings ++ Seq(libraryDependencies ++= liftProjectDeps,
32-
name := "scala-utilities-lift",
33-
scalaVersion := "2.9.1"
34-
)
35-
)
36-
37-
val commonDeps = testDeps ++ jodaDeps
38-
val coreProjectDeps = commonDeps
39-
val liftProjectDeps = jodaDeps ++ liftDeps ++ Seq(scalatestInCompile)
40-
}
41-
1+
import sbt._
2+
import Keys._
3+
4+
import com.typesafe.sbteclipse.core.EclipsePlugin._
5+
6+
object ProjectBuild extends Build {
7+
import BuildSettings._
8+
import ShellPrompt._
9+
import Dependencies._
10+
11+
lazy val root = Project("root",
12+
file("."),
13+
settings = buildSettings ++ Unidoc.settings ++ Seq (
14+
scaladocOptions := Seq(),
15+
// Disable publish and publish-local for empty root project
16+
publish := {},
17+
publishLocal := {}
18+
)
19+
) aggregate(coreProject, liftProject)
20+
21+
lazy val coreProject: Project = Project("core",
22+
file("scala-utilities-core"),
23+
delegates = root :: Nil,
24+
settings = buildSettings ++ Seq(libraryDependencies ++= coreProjectDeps,
25+
name := "scala-utilities-core"
26+
)
27+
)
28+
29+
lazy val liftProject: Project = Project("lift",
30+
file("scala-utilities-lift"),
31+
settings = buildSettings ++ Seq(libraryDependencies ++= liftProjectDeps,
32+
name := "scala-utilities-lift"
33+
)
34+
)
35+
36+
val commonDeps = testDeps ++ jodaDeps
37+
val coreProjectDeps = commonDeps
38+
val liftProjectDeps = jodaDeps ++ liftDeps ++ Seq(scalatestInCompile)
39+
}
40+

0 commit comments

Comments
 (0)
0