Skip to content

Commit af73d2f

Browse files
committed
Bump Scala to 3.3 LTS
1 parent 289949c commit af73d2f

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77
strategy:
88
matrix:
9-
scala: [3.1.2]
9+
scala: [3.3.0]
1010
runs-on: ubuntu-latest
1111

1212
steps:

oolong-bson/src/main/scala/ru/tinkoff/oolong/bson/bson.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ extension (bv: BsonValue)
7676
*
7777
* In a case of key collision bson1 values takes priority
7878
*/
79-
@inline def :+(other: BsonValue): BsonValue = merge(other, bv)
79+
@inline def :+(other: BsonValue): BsonValue = merge(other, bv, false)
8080

8181
/**
8282
* Merges two bson values
@@ -85,7 +85,7 @@ extension (bv: BsonValue)
8585
*
8686
* In a case of key collision bson2 values takes priority
8787
*/
88-
@inline def +:(other: BsonValue): BsonValue = merge(other, bv)
88+
@inline def +:(other: BsonValue): BsonValue = merge(other, bv, false)
8989

9090
extension (ba: BsonArray)
9191
def modify(f: PartialEndo[BsonValue]): BsonArray = BsonArray.fromIterable(
@@ -117,7 +117,7 @@ extension (bd: BsonDocument)
117117
if (bd.containsKey(el._1))
118118
bd.clone().tap { doc =>
119119
val existing = doc.get(el._1)
120-
doc.put(el._1, merge(existing, el._2))
120+
doc.put(el._1, merge(existing, el._2, false))
121121
}
122122
else
123123
bd.clone().append(el._1, el._2)

project/Settings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object Settings {
88
val common = Seq(
99
organization := "ru.tinkoff",
1010
version := "0.1",
11-
scalaVersion := "3.1.3",
11+
scalaVersion := "3.3.0",
1212
scalacOptions ++= Seq(
1313
// For reference: https://docs.scala-lang.org/scala3/guides/migration/options-lookup.html
1414
"-encoding",

project/build.properties

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

0 commit comments

Comments
 (0)