Skip to content

Commit e83d6c8

Browse files
committed
some dependency updates
1 parent 34e725f commit e83d6c8

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 2.4.2
1+
version = 2.5.0
22

33
style = defaultWithAlign
44
project.git = true

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ language: scala
66
services: mongodb
77

88
scala:
9-
- 2.12.11
10-
- 2.13.2
9+
- 2.12.12
10+
- 2.13.3
1111

1212
branches:
1313
only:

build.sbt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ parallelExecution in Test := false
1616
lazy val simple_mongo = (project in file("."))
1717
.enablePlugins(BuildInfoPlugin)
1818
.settings(
19-
buildInfoKeys := BuildInfoKey.ofN(name, version, scalaVersion, sbtVersion),
19+
buildInfoKeys ++= Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
2020
buildInfoPackage := "com.sfxcode.nosql.mongo"
2121
)
2222

@@ -47,7 +47,7 @@ resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repos
4747

4848
// Test
4949

50-
libraryDependencies += "org.specs2" %% "specs2-core" % "4.10.2" % Test
50+
libraryDependencies += "org.specs2" %% "specs2-core" % "4.10.3" % Test
5151

5252
libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3" % Test
5353

@@ -73,6 +73,8 @@ libraryDependencies += "com.typesafe" % "config" % "1.4.0"
7373

7474
libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2"
7575

76+
libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.1.6"
77+
7678
buildInfoPackage := "com.sfxcode.nosql.mongo"
7779

7880
buildInfoOptions += BuildInfoOption.BuildTime

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.12
1+
sbt.version=1.4.0-M2

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
44

55
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
66

7-
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
7+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
88

99
// updates, release
1010

src/main/scala/com/sfxcode/nosql/mongo/bson/BsonConverter.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.mongodb.scala.Document
88
import org.mongodb.scala.bson.BsonArray.fromIterable
99
import org.mongodb.scala.bson.{ObjectId, _}
1010

11-
import scala.collection.JavaConverters._
11+
import scala.jdk.CollectionConverters._
1212
import scala.collection.mutable
1313
import scala.util.matching.Regex
1414

@@ -191,9 +191,7 @@ object BsonConverter {
191191

192192
def asMapList(documents: List[Document]): List[Map[String, Any]] = {
193193
val result = new mutable.ArrayBuffer[Map[String, Any]]()
194-
documents.foreach { document =>
195-
result.+=(asMap(document))
196-
}
194+
documents.foreach(document => result.+=(asMap(document)))
197195
result.toList
198196
}
199197

src/main/scala/com/sfxcode/nosql/mongo/database/MongoConfig.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.typesafe.config.{Config, ConfigFactory}
99
import org.mongodb.scala.connection._
1010
import org.mongodb.scala.{MongoClientSettings, MongoCredential, ServerAddress}
1111

12-
import scala.collection.JavaConverters._
12+
import scala.jdk.CollectionConverters._
1313
import scala.collection.mutable.ArrayBuffer
1414

1515
case class MongoConfig(

src/main/scala/com/sfxcode/nosql/mongo/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import org.mongodb.scala.bson.conversions.Bson
1515
import org.mongodb.scala.gridfs.{GridFSFile, GridFSFindObservable}
1616
import org.mongodb.scala.{Document, FindObservable, Observable, ObservableImplicits}
1717

18-
import scala.collection.JavaConverters._
18+
import scala.jdk.CollectionConverters._
1919
import scala.language.implicitConversions
2020

2121
package object mongo extends ObservableIncludes with DocumentIncludes {

0 commit comments

Comments
 (0)