Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.14, 2.13.12]
scala: [2.12.14, 2.13.16]
java: [corretto@17]
runs-on: ${{ matrix.os }}
steps:
Expand Down
16 changes: 13 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ReleaseTransformations._
import microsites.CdnDirectives

lazy val scala212 = "2.12.14"
lazy val scala213 = "2.13.12"
lazy val scala213 = "2.13.16"
lazy val supportedScalaVersions = List(scala212, scala213)

ThisBuild / scalaVersion := scala213
Expand Down Expand Up @@ -45,7 +45,7 @@ lazy val noPublish = Seq(
lazy val commonSettings = Seq(
organizationName := "MongoDB Java client wrapper for Cats-Effect & FS2",
startYear := Some(2020),
licenses += ("Apache-2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0.txt")),
licenses += ("Apache-2.0", new URI("https://www.apache.org/licenses/LICENSE-2.0.txt").toURL),
headerLicense := Some(HeaderLicense.ALv2("2020", "Kirill5k")),
resolvers += "Apache public" at "https://repository.apache.org/content/groups/public/",
scalafmtOnCompile := true,
Expand All @@ -63,16 +63,26 @@ lazy val root = project
crossScalaVersions := Nil
)
.aggregate(
bson,
core,
circe,
examples,
embedded,
testkit
)

lazy val bson = project
.in(file("bson"))
.settings(commonSettings)
.settings(
name := "mongo4cats-bson",
libraryDependencies ++= Dependencies.bson ++ Dependencies.test,
test / parallelExecution := false)
.enablePlugins(AutomateHeaderPlugin)

lazy val core = project
.in(file("core"))
.dependsOn(embedded % "test->compile")
.dependsOn(bson, embedded % "test->compile")
.settings(commonSettings)
.settings(
name := "mongo4cats-core",
Expand Down
4 changes: 0 additions & 4 deletions circe/src/test/scala/mongo4cats/MongoCollectionSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ class MongoCollectionSpec extends AsyncWordSpec with Matchers with EmbeddedMongo
_ <- db.createCollection("people")
coll <- db.getCollection("people")
_ <- coll.insertOne[Person](p)
filter = Filter.lt("dob", LocalDate.now()) && Filter.lt(
"registrationDate",
Instant.now()
)
people <- coll.find.stream[Person].compile.to(List)
} yield people

Expand Down
11 changes: 10 additions & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ import sbt._
object Dependencies {
private object Versions {
val mongodb = "4.11.1"
val fs2 = "3.10.2"
val fs2 = "3.11.0"
val scalaCompat = "2.6.0"
val circe = "0.14.6"
val findbugsJsr305Version = "1.3.9"
val cats = "2.11.0"

val logback = "1.2.10"
val scalaTest = "3.2.10"
Expand All @@ -25,6 +26,8 @@ object Dependencies {
val mongodbDriverSync = "org.mongodb" % "mongodb-driver-sync" % Versions.mongodb
val findbugsJsr305Version = "com.google.code.findbugs" % "jsr305" % Versions.findbugsJsr305Version % Provided

val catsCore = "org.typelevel" %% "cats-core" % Versions.cats

val fs2Core = "co.fs2" %% "fs2-core" % Versions.fs2
val scalaCompat = "org.scala-lang.modules" %% "scala-collection-compat" % Versions.scalaCompat

Expand All @@ -43,6 +46,12 @@ object Dependencies {

}

lazy val bson = Seq(
Libraries.catsCore,
Libraries.mongodbBson,
Libraries.scalaCompat
)

lazy val core = Seq(
Libraries.mongodbBson,
Libraries.mongodbDriverCore,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.1
sbt.version=1.11.5
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.7.4"
ThisBuild / version := "0.8.0"