Skip to content

Remove Scala 2.11 compat code #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 19, 2023
Merged

Remove Scala 2.11 compat code #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions core/src/test/scala/com/avsystem/commons/serialization/CodecTestData.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,14 @@ object CodecTestData {
@mongoId def id: String
@generated @name("upper_id") def upperId: String = id.toUpperCase
}
object FlatSealedBase {
object FlatSealedBase extends HasGenCodec[FlatSealedBase] {
case class FirstCase(id: String, int: Int = 42) extends FlatSealedBase
case class SecondCase(id: String, dbl: Double, moar: Double*) extends FlatSealedBase
case object ThirdCase extends FlatSealedBase {
@generated def id = "third"
}
case class RecursiveCase(id: String, sub: Opt[FlatSealedBase]) extends FlatSealedBase
case class LocallyRecursiveCase(id: String, sub: Opt[LocallyRecursiveCase]) extends FlatSealedBase
// for Scala 2.11
implicit val codec: GenCodec[FlatSealedBase] = GenCodec.materialize
}

@flatten sealed trait TransparentFlatSealedBase
Expand Down
5 changes: 2 additions & 3 deletions mongo/jvm/src/main/scala/com/avsystem/commons/mongo/typed/MongoRef.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import com.avsystem.commons.mongo.{BsonValueInput, KeyEscaper}
import com.avsystem.commons.serialization.GenCodec.ReadFailure
import com.avsystem.commons.serialization.TransparentWrapping
import org.bson.{BsonDocument, BsonValue}
import scala.annotation.tailrec

/**
* Represents a reference to a particular "place" in a MongoDB document. The "place" may be an actual path
Expand Down Expand Up @@ -188,9 +189,7 @@ sealed trait MongoPropertyRef[E, T] extends MongoRef[E, T]
def twoDimIndex: MongoIndex[E] = index(MongoIndexType.TwoDim)
def twoDimSphereIndex: MongoIndex[E] = index(MongoIndexType.TwoDimSphere)

//noinspection NoTailRecursionAnnotation
//no @tailrec because Scala 2.11 has problems with it
private def computePath[T0](
@tailrec private def computePath[T0](
onlyUpToArray: Boolean,
ref: MongoPropertyRef[E, T0],
acc: List[String],
Expand Down