Skip to content

Commit 3caf2e6

Browse files
committed
refactor: remove compilation errors for source
1 parent 319babd commit 3caf2e6

15 files changed

Lines changed: 18 additions & 23 deletions

File tree

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ developers := List(
4040

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

43-
crossScalaVersions := Seq("2.13.15")
43+
crossScalaVersions := Seq("3.6.0")
4444

4545
scalaVersion := crossScalaVersions.value.head
4646

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
2121

2222
addSbtPlugin("dev.quadstingray" %% "sbt-json" % "0.7.1")
2323

24-
addSbtPlugin("ch.epfl.scala" % "sbt-scala3-migrate" % "0.7.1")
24+
//addSbtPlugin("ch.epfl.scala" % "sbt-scala3-migrate" % "0.7.1")
2525

2626

2727
addDependencyTreePlugin

src/main/scala-2.12/dev/mongocamp/driver/mongodb/schema/CirceProductSchema.scala

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/main/scala/dev/mongocamp/driver/DocumentIncludes.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import org.mongodb.scala.bson.conversions.Bson
1111

1212
import scala.jdk.CollectionConverters._
1313
import scala.language.implicitConversions
14+
import org.mongodb.scala.documentToUntypedDocument
15+
1416
trait DocumentIncludes {
1517
implicit def mapToBson(value: Map[_, _]): Bson = Converter.toDocument(value)
1618

@@ -52,6 +54,7 @@ trait DocumentIncludes {
5254
// ObjectId
5355
implicit def stringToObjectId(str: String): ObjectId = new ObjectId(str)
5456

55-
implicit def documentToObjectId(doc: Document): ObjectId =
57+
implicit def documentToObjectId(doc: Document): ObjectId = {
5658
doc.getObjectId(DatabaseProvider.ObjectIdKey)
59+
}
5760
}

src/main/scala/dev/mongocamp/driver/mongodb/Converter.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package dev.mongocamp.driver.mongodb
22

33
import dev.mongocamp.driver.mongodb.bson.BsonConverter
44
import org.mongodb.scala.Document
5+
import org.mongodb.scala.bsonDocumentToDocument
56

67
object Converter {
78

src/main/scala/dev/mongocamp/driver/mongodb/bson/DocumentHelper.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package dev.mongocamp.driver.mongodb.bson
33
import better.files.{ Scanner, StringSplitter }
44
import com.typesafe.scalalogging.LazyLogging
55
import org.mongodb.scala.Document
6+
import better.files.stringSource
67

78
object DocumentHelper extends LazyLogging {
89
val SplitterDelimeter = ' '

src/main/scala/dev/mongocamp/driver/mongodb/database/CollectionInfo.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import java.util.Date
44

55
import org.mongodb.scala.bson.Document
66
import dev.mongocamp.driver.mongodb._
7+
import org.mongodb.scala.documentToUntypedDocument
78

89
case class CollectionInfo(
910
name: String,

src/main/scala/dev/mongocamp/driver/mongodb/database/DatabaseInfo.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import java.util.Date
44
import dev.mongocamp.driver.mongodb._
55

66
import org.mongodb.scala.bson.Document
7+
import org.mongodb.scala.documentToUntypedDocument
78

89
case class DatabaseInfo(name: String, sizeOnDisk: Double, empty: Boolean, fetched: Date, map: Map[String, Any])
910

src/main/scala/dev/mongocamp/driver/mongodb/gridfs/Base.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.typesafe.scalalogging.LazyLogging
1111
import org.mongodb.scala.bson.ObjectId
1212
import org.mongodb.scala.gridfs.{ GridFSBucket, GridFSDownloadObservable }
1313
import org.mongodb.scala.{ Document, Observable, ReadConcern, ReadPreference, WriteConcern }
14+
import org.mongodb.scala.documentToUntypedDocument
1415

1516
abstract class Base extends LazyLogging {
1617

src/main/scala/dev/mongocamp/driver/mongodb/jdbc/MongoDatabaseMetaData.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import org.mongodb.scala.bson.collection.immutable.Document
1010

1111
import java.sql.{ Connection, DatabaseMetaData, ResultSet, RowIdLifetime, Types }
1212
import scala.collection.mutable.ArrayBuffer
13+
import org.mongodb.scala.documentToUntypedDocument
1314

1415
class MongoDatabaseMetaData(connection: MongoJdbcConnection) extends DatabaseMetaData {
1516
private lazy val semVer = new Semver(BuildInfo.version)

0 commit comments

Comments
 (0)