Skip to content

Commit

Permalink
chore(deps): update dependency scala to v2.13.14 (#686)
Browse files Browse the repository at this point in the history
* chore(deps): update dependency scala to v2.13.14

* fix deps

* fixes

* revert

* fix

* fix import

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lars Hagen <[email protected]>
  • Loading branch information
renovate[bot] and larshagencognite authored Jul 4, 2024
1 parent 35068c9 commit 1fc0fb4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import sbt.{Test, project}
import wartremover.Wart

//val scala3 = "3.2.0"
val scala213 = "2.13.11"
val scala213 = "2.13.14"
val scala212 = "2.12.17"
val supportedScalaVersions = List(scala212, scala213)

Expand Down
10 changes: 5 additions & 5 deletions build.scala-2.13.sbt.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lockVersion" : 1,
"timestamp" : "2024-07-03T10:48:38.551231174Z",
"timestamp" : "2024-07-04T12:12:35.304405Z",
"configurations" : [
"compile",
"optional",
Expand Down Expand Up @@ -650,11 +650,11 @@
{
"org" : "org.scala-lang",
"name" : "scala-library",
"version" : "2.13.11",
"version" : "2.13.14",
"artifacts" : [
{
"name" : "scala-library.jar",
"hash" : "sha1:4fcd82e1ce42d7b157914b86864e7b3591e1e0d2"
"hash" : "sha1:f8b4afe89abe48ca670f620c7da89b71f93e6546"
}
],
"configurations" : [
Expand All @@ -666,11 +666,11 @@
{
"org" : "org.scala-lang",
"name" : "scala-reflect",
"version" : "2.13.11",
"version" : "2.13.14",
"artifacts" : [
{
"name" : "scala-reflect.jar",
"hash" : "sha1:965b382f32d914716b0c6a8d05956a3600a7b35a"
"hash" : "sha1:8e275fefb2a01e178db2cdfebb2181062a790b82"
}
],
"configurations" : [
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.10")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.0")
addSbtPlugin("au.com.onegeek" %% "sbt-dotenv" % "2.1.233")
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.1.6")
addSbtPlugin("software.purpledragon" % "sbt-dependency-lock" % "1.5.0")
Expand Down
6 changes: 0 additions & 6 deletions src/main/scala/com/cognite/sdk/scala/common/dataTypes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,20 @@ import io.circe.{Decoder, Encoder, Json, JsonObject, KeyEncoder}
import io.circe.generic.semiauto.{deriveDecoder, deriveEncoder}
import sttp.model.Uri

import scala.annotation.nowarn

trait ResponseWithCursor {
val nextCursor: Option[String]
}
final case class ItemsWithCursor[A](items: Seq[A], nextCursor: Option[String] = None)
extends ResponseWithCursor
object ItemsWithCursor {
@nowarn
implicit def itemsWithCursorEncoder[A: Encoder]: Encoder[ItemsWithCursor[A]] =
deriveEncoder[ItemsWithCursor[A]]
@nowarn
implicit def itemsWithCursorDecoder[A: Decoder]: Decoder[ItemsWithCursor[A]] =
deriveDecoder[ItemsWithCursor[A]]
}
final case class Items[A](items: Seq[A])
object Items {
@nowarn
implicit def itemsEncoder[A: Encoder]: Encoder[Items[A]] = deriveEncoder[Items[A]]
@nowarn
implicit def itemsDecoder[A: Decoder]: Decoder[Items[A]] = deriveDecoder[Items[A]]
}
final case class ItemsWithIgnoreUnknownIds[A](items: Seq[A], ignoreUnknownIds: Boolean)
Expand Down

0 comments on commit 1fc0fb4

Please sign in to comment.