10000 Added cross compilation capability for 2.9.1 and 2.9.2 · randomcoding/scala-utilities@0d435eb · GitHub
[go: up one dir, main page]
Skip to content

Commit 0d435eb

Browse files
randomcoderrandomcoder
committed
Added cross compilation capability for 2.9.1 and 2.9.2
The lift and rogue dependencies needed to be foxed at 2.9.1 however as they are not avaiable of 2.9.2.
1 parent fa92cad commit 0d435eb

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

‎project/BuildSettings.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ object BuildSettings {
1111
val buildOrganization = "uk.co.randomcoding"
1212
val buildVersion = "0.1.0-SNAPSHOT"
1313
val buildScalaVersion = "2.9.2"
14+
val crossBuildScalaVersions = Seq("2.9.1")
1415

1516
val buildSettings = Defaults.defaultSettings ++ Seq(
1617
organization := buildOrganization,
1718
version := buildVersion,
1819
scalaVersion := buildScalaVersion,
20+
crossScalaVersions := crossBuildScalaVersions ++ Seq(buildScalaVersion),
1921
parallelExecution in Test := false,
2022
shellPrompt := ShellPrompt.buildShellPrompt,
2123
scalacOptions := Seq("-deprecation", "-unchecked"),

‎project/Dependencies.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ object Dependencies {
88
val liftVersion = "2.4"
99

1010
// Functions to create dependencies
11-
val liftDep = (componentId: String, scope: String ) => "net.liftweb" %% componentId % liftVersion % scope
11+
val liftDep = (componentId: String, scope: String ) => {
12+
val id = "%s_2.9.1".format(componentId)
13+
"net.liftweb" % id % liftVersion % scope
14+
}
1215

1316
// Actual dependencies
1417
// liftweb
@@ -18,7 +21,7 @@ object Dependencies {
1821
val liftMongoRecord = liftDep("lift-mongodb-record", "compile")
1922

2023
// Rogue - used for Mongo DB Queries
21-
val rogue = "com.foursquare" %% "rogue" % "1.1.1" intransitive()
24+
val rogue = "com.foursquare" % "rogue_2.9.1" % "1.1.8" intransitive()
2225

2326
// Joda time
2427
val jodaTime = "joda-time" % "joda-time" % "2.0"
@@ -27,6 +30,7 @@ object Dependencies {
2730
val logback = "ch.qos.logback" % "logback-classic" % "1.0.0"
2831

2932
val scalatest = "org.scalatest" %% "scalatest" % "1.8" % "test"
33+
val scalatestInCompile = "org.scalatest" %% "scalatest" % "1.8"
3034

3135
val groovy = "org.codehaus.groovy" % "groovy" % "2.0.0"
3236

‎project/ProjectBuild.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ object ProjectBuild extends Build {
3636

3737
val commonDeps = testDeps ++ jodaDeps
3838
val coreProjectDeps = commonDeps
39-
val liftProjectDeps = commonDeps ++ liftDeps
39+
val liftProjectDeps = jodaDeps ++ liftDeps ++ Seq(scalatestInCompile)
4040
}
4141

0 commit comments

Comments
 (0)
0