Skip to content

Commit

Permalink
Merge pull request #150 from cibotech/bump-circe
Browse files Browse the repository at this point in the history
Updating circe version to 0.14.9
  • Loading branch information
scottynomad authored Oct 23, 2024
2 parents 9b2cba9 + e71c218 commit 066d765
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## [Changes since last release]

### Fixed
- Updated circe patch version to 0.13.0 -> 0.14.9 to support updates in cibo standard versions
- Updated circe-generic-extras 0.13.0 -> 0.14.4
- Updated ScalaJS version 1.8.0 -> 1.17.0
- Added external scalajs-java-securerandom dependency as required in ScalaJS >= 1.10.0

## [0.9.1] - 2023-11-15
### Fixed
- scalactic dependency version no longer leaks to downstream projects
Expand Down
8 changes: 5 additions & 3 deletions project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ object Settings {
val scalaTest = "3.2.15"
val scalactic = "3.2.15"
val scopt = "3.5.0"
val circe = "0.13.0"
val circe = "0.14.9"
val circeGenericExtras = "0.14.4"
val jupyterScala = "0.4.1"
}

Expand All @@ -26,7 +27,7 @@ object Settings {
"io.circe" %%% "circe-core" % versions.circe,
"io.circe" %%% "circe-generic" % versions.circe,
"io.circe" %%% "circe-parser" % versions.circe,
"io.circe" %%% "circe-generic-extras" % versions.circe,
"io.circe" %%% "circe-generic-extras" % versions.circeGenericExtras,
"org.scalatest" %%% "scalatest" % versions.scalaTest % "it,test",
)
)
Expand Down Expand Up @@ -62,7 +63,8 @@ object Settings {

val scalajsDependencies = Def.setting(
Seq(
"org.scala-js" %%% "scalajs-dom" % versions.scalaDom
"org.scala-js" %%% "scalajs-dom" % versions.scalaDom,
"org.scala-js" %%% "scalajs-java-securerandom" % "1.0.0",
)
)

Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.4.0")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")

libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0"

addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1")
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3")

dependencyOverrides ++= Seq(
"org.scala-js" % "sbt-scalajs" % "1.8.0",
"org.scala-js" % "sbt-scalajs" % "1.17.0",
"com.typesafe.akka" %% "akka-actor" % "2.6.1",
"com.typesafe.akka" %% "akka-stream" % "2.6.1"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import com.cibo.evilplot.colors.Color
import com.cibo.evilplot.numeric.{Point, Point2d}
import io.circe.generic.extras.Configuration
import io.circe.generic.extras.semiauto._
import io.circe.{Decoder, Encoder, ObjectEncoder}
import io.circe.{Decoder, Encoder}

sealed trait Gradient2d {
val stops: Seq[GradientStop]
Expand Down

0 comments on commit 066d765

Please sign in to comment.