Bump Scala to 3.3 LTS

Tinkoff · Jul 2, 2023 · af73d2f · af73d2f
1 parent 289949c
commit af73d2f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     strategy:
       matrix:
-        scala: [3.1.2]
+        scala: [3.3.0]
     runs-on: ubuntu-latest
 
     steps:

diff --git a/oolong-bson/src/main/scala/ru/tinkoff/oolong/bson/bson.scala b/oolong-bson/src/main/scala/ru/tinkoff/oolong/bson/bson.scala
@@ -76,7 +76,7 @@ extension (bv: BsonValue)
    *
    * In a case of key collision bson1 values takes priority
    */
-  @inline def :+(other: BsonValue): BsonValue = merge(other, bv)
+  @inline def :+(other: BsonValue): BsonValue = merge(other, bv, false)
 
   /**
    * Merges two bson values
@@ -85,7 +85,7 @@ extension (bv: BsonValue)
    *
    * In a case of key collision bson2 values takes priority
    */
-  @inline def +:(other: BsonValue): BsonValue = merge(other, bv)
+  @inline def +:(other: BsonValue): BsonValue = merge(other, bv, false)
 
 extension (ba: BsonArray)
   def modify(f: PartialEndo[BsonValue]): BsonArray = BsonArray.fromIterable(
@@ -117,7 +117,7 @@ extension (bd: BsonDocument)
     if (bd.containsKey(el._1))
       bd.clone().tap { doc =>
         val existing = doc.get(el._1)
-        doc.put(el._1, merge(existing, el._2))
+        doc.put(el._1, merge(existing, el._2, false))
       }
     else
       bd.clone().append(el._1, el._2)
diff --git a/project/Settings.scala b/project/Settings.scala
@@ -8,7 +8,7 @@ object Settings {
   val common = Seq(
     organization := "ru.tinkoff",
     version := "0.1",
-    scalaVersion := "3.1.3",
+    scalaVersion := "3.3.0",
     scalacOptions ++= Seq(
       // For reference: https://docs.scala-lang.org/scala3/guides/migration/options-lookup.html
       "-encoding",

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.6.2
+sbt.version = 1.9.0