Skip to content
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

Update/jsoniter scala core 2.13.13 #179

Merged
merged 6 commits into from
Apr 14, 2022
Merged

Update/jsoniter scala core 2.13.13 #179

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6dca2ad
Update jsoniter-scala-core to 2.13.13
scala-steward Apr 12, 2022
178919d
Use scalajs with fixed UUID generation
daddykotex Apr 13, 2022
735927a
Use 2.13 for 3
daddykotex Apr 13, 2022
894701f
Revert "Use 2.13 for 3"
daddykotex Apr 13, 2022
a5b52b9
Revert "Use scalajs with fixed UUID generation"
daddykotex Apr 13, 2022
eee569c
Uses cats-effect 3.3.11 to use custom uuid generation
daddykotex Apr 13, 2022
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
17 changes: 15 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,12 @@ lazy val json = projectMatrix
Test / fork := virtualAxes.value.contains(VirtualAxis.jvm)
)
.jvmPlatform(allJvmScalaVersions, jvmDimSettings)
.jsPlatform(allJsScalaVersions, jsDimSettings)
.jsPlatform(
allJsScalaVersions,
jsDimSettings ++ Seq(
libraryDependencies += Dependencies.ScalaJS.scalaJsJavaSecureRandom.value
)
)

/**
* Module that contains http4s-specific client/server bindings for the
Expand Down Expand Up @@ -634,14 +639,22 @@ val isCE3 = settingKey[Boolean]("Is the current build using CE3?")

lazy val Dependencies = new {

object ScalaJS {
val scalaJsJavaSecureRandom: Def.Initialize[ModuleID] = Def.setting(
("org.scala-js" %%% "scalajs-java-securerandom" % "1.0.0").cross(
CrossVersion.for3Use2_13
daddykotex marked this conversation as resolved.
Show resolved Hide resolved
)
)
}

val collectionsCompat =
Def.setting(
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.7.0"
)

val Jsoniter =
Def.setting(
"com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-core" % "2.13.12"
"com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-core" % "2.13.13"
)

val Smithy = new {
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// format: off
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.9.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.11")
Expand Down