Skip to content

Commit 8002671

Browse files
authored
Merge branch 'master' into update/zio-logging-2.5.1
2 parents 8d2efa4 + 96bd01b commit 8002671

5 files changed

Lines changed: 7 additions & 9 deletions

File tree

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ lazy val `quill-engine` =
205205
("com.github.takayahilton" %% "sql-formatter" % "1.2.1").cross(CrossVersion.for3Use2_13),
206206
"io.suzaku" %% "boopickle" % "1.5.0",
207207
"com.lihaoyi" %% "pprint" % "0.9.0",
208-
"com.github.ben-manes.caffeine" % "caffeine" % "3.2.0"
208+
"com.github.ben-manes.caffeine" % "caffeine" % "3.2.2"
209209
),
210210
coverageExcludedPackages := "<empty>;.*AstPrinter;.*Using;io.getquill.Model;io.getquill.ScalarTag;io.getquill.QuotationTag"
211211
)
@@ -424,7 +424,7 @@ lazy val `quill-jdbc-zio` =
424424
libraryDependencies ++= Seq(
425425
// Needed for PGObject in JsonExtensions but not necessary if user is not using postgres
426426
"org.postgresql" % "postgresql" % "42.7.5" % "provided",
427-
"dev.zio" %% "zio-json" % "0.7.43"
427+
"dev.zio" %% "zio-json" % "0.7.44"
428428
),
429429
Test / testGrouping := {
430430
(Test / definedTests).value map { test =>
@@ -511,7 +511,7 @@ lazy val `quill-orientdb` =
511511
.settings(
512512
Test / fork := true,
513513
libraryDependencies ++= Seq(
514-
"com.orientechnologies" % "orientdb-graphdb" % "3.2.39"
514+
"com.orientechnologies" % "orientdb-graphdb" % "3.2.42"
515515
)
516516
)
517517
.dependsOn(
@@ -536,7 +536,7 @@ lazy val jdbcTestingLibraries = Seq(
536536
"com.mysql" % "mysql-connector-j" % "9.3.0" % Test,
537537
"com.h2database" % "h2" % "2.3.232" % Test,
538538
"org.postgresql" % "postgresql" % "42.7.5" % Test,
539-
"org.xerial" % "sqlite-jdbc" % "3.49.1.0" % Test,
539+
"org.xerial" % "sqlite-jdbc" % "3.50.2.0" % Test,
540540
"com.microsoft.sqlserver" % "mssql-jdbc" % "7.4.1.jre11" % Test,
541541
"com.oracle.ojdbc" % "ojdbc8" % "19.3.0.0" % Test,
542542
"org.mockito" %% "mockito-scala-scalatest" % "1.17.14" % Test

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import sbt.*
22
import sbt.Keys.*
33

44
object Version {
5-
val zio = "2.1.16"
5+
val zio = "2.1.19"
66
}
77

88
sealed trait ExcludeTests

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releas
44

55
addDependencyTreePlugin
66

7-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
7+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5")
88
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1")
99
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
1010
addSbtPlugin("com.etsy" % "sbt-compile-quick-plugin" % "1.4.0")

quill-jdbc-zio/src/test/scala/io/getquill/mock/ZioMockSpec.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ class ZioMockSpec extends AnyFreeSpec with MockitoSugar { // with AsyncMockitoSu
148148
}.getOrThrow()
149149
}
150150

151-
resultMsg.contains("fiber") mustBe true
152151
resultMsg.contains(msg) mustBe true
153152

154153
// In test suite verifications come after
@@ -188,7 +187,6 @@ class ZioMockSpec extends AnyFreeSpec with MockitoSugar { // with AsyncMockitoSu
188187
}.getOrThrow()
189188
}
190189

191-
resultMsg.contains("fiber") mustBe true
192190
resultMsg.contains(msg) mustBe true
193191

194192
// In test suite verifications come after

0 commit comments

Comments
 (0)