Skip to content

Bump Scala to 3.3 LTS #26

Merged
merged 1 commit into from
Jul 2, 2023
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 @@ -6,7 +6,7 @@ jobs:
build:
strategy:
matrix:
scala: [3.1.2]
scala: [3.3.0]
runs-on: ubuntu-latest

steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(
Expand Down Expand Up @@ -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)
2 changes: 1 addition & 1 deletion project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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",
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.2
sbt.version = 1.9.0