Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Move to Scala 2.10.0-M6

  • Loading branch information...
commit f6ac81ffc56f0d7abfde7dd5ab8a067182218328 2 parents c17ae80 + f672177
@szeiger szeiger authored
View
6 build.sbt
@@ -8,11 +8,13 @@ version := "0.11.0-SNAPSHOT"
//scalaVersion := "2.10.0-unknown-unknown"
//scalaVersion := "2.10.0-SNAPSHOT"
-scalaVersion := "2.10.0-M5"
+scalaVersion := "2.10.0-M6"
+
+scalaBinaryVersion in Global := "2.10.0-M6"
resolvers += Resolver.sonatypeRepo("snapshots")
-crossScalaVersions ++= "2.10.0-M4" :: Nil
+//crossScalaVersions ++= "2.10.0-M4" :: Nil
//crossVersion := CrossVersion.Disabled
//scalaHome := Some(file("C:/Users/szeiger/code/scala/build/pack"))
View
4 src/main/scala/scala/slick/queryable/ImplicitQueryable.scala
@@ -27,7 +27,7 @@ object ImplicitQueryableMacros{
val backend = c.Expr[SlickBackend]( Select( c.prefix.tree, newTermName("backend") ) )
val session = c.Expr[Session]( Select( c.prefix.tree, newTermName("session") ) )
- c.reify{
+ reify{
implicit val _session = session.splice
backend.splice.result( queryable.splice )
}
@@ -39,7 +39,7 @@ object ImplicitQueryableMacros{
val backend = c.Expr[SlickBackend]( Select( c.prefix.tree, newTermName("backend") ) )
val session = c.Expr[Session]( Select( c.prefix.tree, newTermName("session") ) )
- c.reify{
+ reify{
implicit val _session = session.splice
ImplicitQueryable( queryable.splice, backend.splice )
}
View
4 src/main/scala/scala/slick/queryable/Queryable.scala
@@ -50,7 +50,7 @@ object QueryableMacros{
Utils[c.type](c).removeDoubleReify(
Select(c.prefix.tree, newTermName( "_"+name+"_placeholder" ))
).asInstanceOf[Tree])))
- c.reify{ new QueryableValue( reifiedExpression.splice ) } //new QueryableValue( reifiedExpression.splice )}
+ reify{ new QueryableValue( reifiedExpression.splice ) } //new QueryableValue( reifiedExpression.splice )}
}
def length
(c: scala.reflect.makro.Context)
@@ -65,7 +65,7 @@ object QueryableMacros{
Apply(Select(c.prefix.tree, newTermName( "_"+name+"_placeholder" )), List( projection.tree ))
).asInstanceOf[Tree]
)))
- c.reify{ Queryable.factory[S]( reifiedExpression.splice )}
+ reify{ Queryable.factory[S]( reifiedExpression.splice )}
}
def map[T:c.TypeTag, S:c.TypeTag]
Please sign in to comment.
Something went wrong with that request. Please try again.