Skip to content

Commit 671bf82

Browse files
committed
Fixing binding to work with scala 2.10
1 parent b430384 commit 671bf82

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

mybatis-scala-core/project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ object Resolvers {
1515
}
1616

1717
object Dependencies {
18-
val mybatis = "org.mybatis" % "mybatis" % "3.2.0-SNAPSHOT"
18+
val mybatis = "org.mybatis" % "mybatis" % "3.2.0"
1919
val scalatest = "org.scalatest" %% "scalatest" % "1.9.1" % "test"
2020
}
2121

mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Binding.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ object Binding {
9595
,if (resultMap != null) Some("resultMap=" + resultMap.fqi.id) else None
9696
,{
9797
val t = manifest[JavaType].runtimeClass
98-
if (t != classOf[Object]) Some("javaType=" + translate(t)) else None
98+
if (t != classOf[Nothing]) Some("javaType=" + translate(t)) else None
9999
}
100100
) filter {_ match {case Some(x) => true; case None => false }} map {_.get} mkString("#{", ",", "}")
101101
}
@@ -108,4 +108,4 @@ object Binding {
108108
/** Implicit conversion for simplified syntax support */
109109
implicit def StringToParam(s : String) = new Param(s)
110110

111-
}
111+
}

mybatis-scala-samples/project/Build.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ object Resolvers {
1717
object Dependencies {
1818
val mybatis = "org.mybatis.scala" %% "mybatis-scala-core" % "1.0.1"
1919
val hsqldb = "org.hsqldb" % "hsqldb" % "2.2.8"
20+
val log4j = "log4j" % "log4j" % "1.2.17"
2021
}
2122

2223
object MainBuild extends Build {
@@ -25,7 +26,7 @@ object MainBuild extends Build {
2526
import Resolvers._
2627
import Dependencies._
2728

28-
val deps = Seq(mybatis, hsqldb)
29+
val deps = Seq(mybatis, hsqldb, log4j)
2930
val coreResolvers = Seq(sonatypeSnapshots, sonatype)
3031

3132
lazy val samples = Project(

project/Build.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ object Resolvers {
1515
}
1616

1717
object Dependencies {
18-
val mybatis = "org.mybatis" % "mybatis" % "3.2.0-SNAPSHOT"
18+
val mybatis = "org.mybatis" % "mybatis" % "3.2.0"
1919
val scalatest = "org.scalatest" %% "scalatest" % "1.9.1" % "test"
2020
val hsqldb = "org.hsqldb" % "hsqldb" % "2.2.8"
21+
val log4j = "log4j" % "log4j" % "1.2.17"
2122
}
2223

2324
object MainBuild extends Build {
@@ -44,7 +45,7 @@ object MainBuild extends Build {
4445
lazy val samples = Project(
4546
"mybatis-scala-samples",
4647
file("mybatis-scala-samples"),
47-
settings = buildSettings ++ Seq(resolvers := coreResolvers, libraryDependencies += hsqldb)
48+
settings = buildSettings ++ Seq(resolvers := coreResolvers, libraryDependencies ++= Seq(hsqldb,log4j))
4849
) dependsOn(core)
4950

5051
}

0 commit comments

Comments
 (0)