Skip to content

Commit 9e83f43

Browse files
authored
Merge pull request #505 from scala-steward/update/coursier-2.1.22
Update coursier to 2.1.22
2 parents c9cad16 + c8f8201 commit 9e83f43

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

build.sbt

+18-8
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,22 @@ inThisBuild(
1717
val ScalaLTS = "3.3.4"
1818
val ScalaNext = "3.5.2"
1919

20+
val jsoniterVersion = "2.32.0"
21+
2022
ThisBuild / scalaVersion := ScalaNext
2123
ThisBuild / versionScheme := Some("early-semver")
2224

2325
import scala.sys.process.*
26+
import scala.util.chaining.*
27+
28+
// Workaround for https://github.com/coursier/coursier/issues/2001
29+
// from https://github.com/coursier/coursier/issues/2001#issuecomment-2556556628
30+
def jsoniterFix(deps: Seq[ModuleID]) =
31+
deps.map(
32+
_.exclude("com.github.plokhotnyuk.jsoniter-scala", "jsoniter-scala-core_3")
33+
) ++ Seq(
34+
"com.github.plokhotnyuk.jsoniter-scala" % "jsoniter-scala-core_2.13" % jsoniterVersion
35+
)
2436

2537
def crossPlugin(
2638
x: sbt.librarymanagement.ModuleID
@@ -88,7 +100,7 @@ def module(
88100
lazy val pluginCore = module("plugin-core").settings(
89101
libraryDependencies ++= Seq(
90102
"com.disneystreaming.smithy4s" %% "smithy4s-http4s" % smithy4sVersion.value
91-
),
103+
).pipe(jsoniterFix),
92104
// mimaPreviousArtifacts := Set(organization.value %% name.value % "0.7.0"),
93105
mimaPreviousArtifacts := Set.empty,
94106
scalaVersion := ScalaLTS,
@@ -163,14 +175,14 @@ lazy val core = module("core")
163175
.settings(
164176
libraryDependencies ++= Seq(
165177
"org.typelevel" %% "cats-effect" % "3.5.7",
166-
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.32.0",
178+
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % jsoniterVersion,
167179
"com.disneystreaming.smithy4s" %% "smithy4s-dynamic" % smithy4sVersion.value,
168180
"com.disneystreaming.smithy4s" %% "smithy4s-http4s" % smithy4sVersion.value,
169181
"com.disneystreaming.smithy4s" %% "smithy4s-aws-http4s" % smithy4sVersion.value,
170182
"com.disneystreaming.smithy4s" % "smithy4s-protocol" % smithy4sVersion.value % Test,
171183
"com.disneystreaming.alloy" % "alloy-core" % "0.3.14" % Test,
172184
"software.amazon.smithy" % "smithy-aws-traits" % "1.53.0" % Test,
173-
)
185+
).pipe(jsoniterFix)
174186
)
175187
.dependsOn(
176188
protocol4s,
@@ -194,12 +206,10 @@ lazy val lsp = module("lsp")
194206
"io.circe" %% "circe-core" % "0.14.10",
195207
"org.http4s" %% "http4s-ember-client" % "0.23.30",
196208
"org.http4s" %% "http4s-ember-server" % "0.23.30" % Test,
197-
("io.get-coursier" % "coursier" % "2.1.14")
198-
.cross(CrossVersion.for3Use2_13)
199-
.exclude("org.scala-lang.modules", "scala-collection-compat_2.13")
200-
.exclude("com.github.plokhotnyuk.jsoniter-scala", "jsoniter-scala-core_2.13"),
209+
("io.get-coursier" % "coursier_2.13" % "2.1.22")
210+
.exclude("org.scala-lang.modules", "scala-collection-compat_2.13"),
201211
"org.typelevel" %% "cats-tagless-core" % "0.16.2",
202-
),
212+
).pipe(jsoniterFix),
203213
buildInfoPackage := "playground.lsp.buildinfo",
204214
buildInfoKeys ++= Seq(version, scalaBinaryVersion),
205215
(Test / test) := {

0 commit comments

Comments
 (0)