8000 Updated to Scala 2.10 · randomcoding/scala-utilities@b3e1373 · GitHub
[go: up one dir, main page]
Skip to content < 8000 script type="application/json" data-target="react-partial.embeddedData">{"props":{"docsUrl":"https://docs.github.com/get-started/accessibility/keyboard-shortcuts"}}

Commit b3e1373

Browse files
randomcoderrandomcoder
committed
Updated to Scala 2.10
* Removed the rogue dependencies as they are not actually used and rogue hasnot yet moved to 2.10
1 parent f8d9d68 commit b3e1373

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

‎project/BuildSettings.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ object BuildSettings {
1010

1111
val buildOrganization = "uk.co.randomcoding"
1212
val buildVersion = "0.1.0-SNAPSHOT"
13-
val buildScalaVersion = "2.9.2"
14-
val crossBuildScalaVersions = Seq("2.9.1")
13+
val buildScalaVersion = "2.10.1"
1514

1615
val buildSettings = Defaults.defaultSettings ++ Seq(
1716
organization := buildOrganization,
1817
version := buildVersion,
1918
scalaVersion := buildScalaVersion,
20-
crossScalaVersions := crossBuildScalaVersions ++ Seq(buildScalaVersion),
2119
parallelExecution in Test := false,
2220
shellPrompt := ShellPrompt.buildShellPrompt,
2321
scalacOptions := Seq("-deprecation", "-unchecked"),

‎project/Dependencies.scala

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ import sbt._
55
*/
66
object Dependencies {
77
// Common Versions for libraries
8-
val liftVersion = "2.4"
8+
val liftVersion = "2.5-RC5"
99

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

1615
// Actual dependencies
@@ -21,22 +20,24 @@ object Dependencies {
2120
val liftMongoRecord = liftDep("lift-mongodb-record", "compile")
2221

2322
// Rogue - used for Mongo DB Queries
24-
val rogue = "com.foursquare" % "rogue_2.9.1" % "1.1.8" intransitive()
23+
// val rogue = Seq("lift", "field", "core").map(component =>
24+
// "com.foursquare" %% "rogue-%s".format(component) % "2.0.0-RC2" intransitive())
2525

2626
// Joda time
2727
val jodaTime = "joda-time" % "joda-time" % "2.0"
2828
val jodaConvert = "org.joda" % "joda-convert" % "1.2"
2929

3030
val logback = "ch.qos.logback" % "logback-classic" % "1.0.0"
3131

32-
val scalatest = "org.scalatest" %% "scalatest" % "1.8" % "test"
33-
val scalatestInCompile = "org.scalatest" %% "scalatest" % "1.8"
32+
val scalatestVersion = "2.0.M5b"
33+
val scalatest = "org.scalatest" %% "scalatest" % scalatestVersion % "test"
34+
val scalatestInCompile = "org.scalatest" %% "scalatest" % scalatestVersion
3435

3536
val groovy = "org.codehaus.groovy" % "groovy" % "2.0.0"
3637

3738
// Dependency groups
3839
val testDeps = Seq(scalatest)
39-
val liftDeps = Seq(liftUtil, liftCommon, liftWebkit, liftMongoRecord, rogue)
40+
val liftDeps = /*rogue ++*/ Seq(liftUtil, liftCommon, liftWebkit, liftMongoRecord)
4041
val loggingDeps = Seq(logback, groovy, liftCommon)
4142
val jodaDeps = Seq(jodaTime, jodaConvert)
4243
}

‎scala-utilities-lift/src/main/scala/uk/co/randomcoding/scala/util/lift/mongodb/BaseMongoRecordObject.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import org.bson.types.ObjectId
2323
import net.liftweb.mongodb.record.MongoMetaRecord
2424
import net.liftweb.mongodb.record.MongoRecord
2525
import net.liftweb.mongodb.record.field.ObjectIdPk
26-
import com.foursquare.rogue.Rogue
2726

2827
/**
2928
* Provides common functionality for record companion objects to find matching records and find records by id.
@@ -115,4 +114,4 @@ trait BaseMongoRecordObject[T <: MongoRecord[T] with ObjectIdPk[T]] {
115114
case Some(t) => Some(t)
116115
case _ => t.saveTheRecord
117116
}
118-
}
117+
}

‎scala-utilities-lift/src/main/scala/uk/co/randomcoding/scala/util/lift/snippet/TransformHelpers.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ import net.liftweb.util.Helpers._
3737
object TransformHelpers {
3838

3939
/**
40-
* A readonly element attribute
40+
* A read only element attribute
4141
*/
42-
val readonly: ElemAttr = ("readonly", "readonly");
42+
val readonly: ElemAttr = ("readonly", "readonly")
43+
44+
val enabledFalse: ElemAttr = ("enabled", "false")
4345

4446
val noopFunction = () => ()
4547

0 commit comments

Comments
 (0)
0