Skip to content

Commit 6ee4c60

Browse files
committed
Update to mongo scala driver 2.2.0
1 parent 8395f90 commit 6ee4c60

File tree

7 files changed

+17
-18
lines changed

7 files changed

+17
-18
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ language: scala
44
services: mongodb
55

66
scala:
7-
- 2.11.8
8-
- 2.12.1
7+
- 2.11.11
8+
- 2.12.4
99
branches:
1010
only:
1111
- master

build.sbt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name := "simple-mongo"
33

44
organization := "com.sfxcode.nosql"
55

6-
crossScalaVersions := Seq("2.12.3", "2.11.11")
6+
crossScalaVersions := Seq("2.12.4", "2.11.11")
77

8-
scalaVersion := "2.12.3"
8+
scalaVersion := "2.12.4"
99

1010
scalacOptions += "-deprecation"
1111

@@ -22,7 +22,7 @@ buildInfoOptions += BuildInfoOption.BuildTime
2222

2323
// Test
2424

25-
libraryDependencies += "org.specs2" %% "specs2-core" % "4.0.0" % "test"
25+
libraryDependencies += "org.specs2" %% "specs2-core" % "4.0.2" % "test"
2626

2727
libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3" % "test"
2828

@@ -32,11 +32,14 @@ libraryDependencies += "joda-time" % "joda-time" % "2.9.9" % "test"
3232

3333
libraryDependencies += "org.json4s" %% "json4s-native" % "3.5.3" % "test"
3434

35-
libraryDependencies += "org.mongodb.scala" %% "mongo-scala-driver" % "2.1.0"
35+
libraryDependencies += "org.mongodb.scala" %% "mongo-scala-driver" % "2.2.0"
3636

3737

3838
libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2"
3939

40+
buildInfoPackage := "com.sfxcode.nosql.mongo"
41+
42+
buildInfoOptions += BuildInfoOption.BuildTime
4043

4144
licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html"))
4245

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.0.2
1+
sbt.version=1.0.4

project/plugin.sbt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
2-
// addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
3-
41
addSbtPlugin("com.orrsella" % "sbt-stats" % "1.0.7")
52

63
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
@@ -9,8 +6,10 @@ addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.0")
96

107
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
118

12-
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.2")
9+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.3")
1310

1411
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
1512

1613
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1")
14+
15+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")

src/main/scala/com/sfxcode/nosql/mongo/operation/ObservableIncludes.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ trait ObservableIncludes {
1919

2020
def result(maxWait: Int = 10): Option[C] = {
2121
val list = Await.result(asFuture(), Duration(maxWait, TimeUnit.SECONDS)).toList
22-
if (list.size == 1)
23-
Some(list.head)
24-
else
25-
None
22+
list.headOption
2623
}
2724

2825
}
@@ -42,7 +39,7 @@ trait ObservableIncludes {
4239
results().foreach(res => println(debugString(res)))
4340
}
4441

45-
def printHeadResult(initial: String = ""): Unit = println(s"${initial}${debugString(headResult())}")
42+
def printHeadResult(initial: String = ""): Unit = println(s"$initial${debugString(headResult())}")
4643
}
4744

4845
}

src/test/resources/logback-test.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</appender>
99

1010

11-
<logger name="com.sfxcode.sapphire.core" level="dubug" />
11+
<logger name="com.sfxcode.sapphire.core" level="debug" />
1212

1313
<root level="info">
1414
<appender-ref ref="STDOUT" />

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version in ThisBuild := "1.0.1"
1+
version in ThisBuild := "1.0.2"

0 commit comments

Comments
 (0)