Skip to content

Commit

Permalink
Merge pull request #505 from scala-steward/update/coursier-2.1.22
Browse files Browse the repository at this point in the history
Update coursier to 2.1.22
  • Loading branch information
mergify[bot] authored Dec 22, 2024
2 parents c9cad16 + c8f8201 commit 9e83f43
Showing 1 changed file with 18 additions and 8 deletions.
26 changes: 18 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,22 @@ inThisBuild(
val ScalaLTS = "3.3.4"
val ScalaNext = "3.5.2"

val jsoniterVersion = "2.32.0"

ThisBuild / scalaVersion := ScalaNext
ThisBuild / versionScheme := Some("early-semver")

import scala.sys.process.*
import scala.util.chaining.*

// Workaround for https://github.com/coursier/coursier/issues/2001
// from https://github.com/coursier/coursier/issues/2001#issuecomment-2556556628
def jsoniterFix(deps: Seq[ModuleID]) =
deps.map(
_.exclude("com.github.plokhotnyuk.jsoniter-scala", "jsoniter-scala-core_3")
) ++ Seq(
"com.github.plokhotnyuk.jsoniter-scala" % "jsoniter-scala-core_2.13" % jsoniterVersion
)

def crossPlugin(
x: sbt.librarymanagement.ModuleID
Expand Down Expand Up @@ -88,7 +100,7 @@ def module(
lazy val pluginCore = module("plugin-core").settings(
libraryDependencies ++= Seq(
"com.disneystreaming.smithy4s" %% "smithy4s-http4s" % smithy4sVersion.value
),
).pipe(jsoniterFix),
// mimaPreviousArtifacts := Set(organization.value %% name.value % "0.7.0"),
mimaPreviousArtifacts := Set.empty,
scalaVersion := ScalaLTS,
Expand Down Expand Up @@ -163,14 +175,14 @@ lazy val core = module("core")
.settings(
libraryDependencies ++= Seq(
"org.typelevel" %% "cats-effect" % "3.5.7",
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.32.0",
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % jsoniterVersion,
"com.disneystreaming.smithy4s" %% "smithy4s-dynamic" % smithy4sVersion.value,
"com.disneystreaming.smithy4s" %% "smithy4s-http4s" % smithy4sVersion.value,
"com.disneystreaming.smithy4s" %% "smithy4s-aws-http4s" % smithy4sVersion.value,
"com.disneystreaming.smithy4s" % "smithy4s-protocol" % smithy4sVersion.value % Test,
"com.disneystreaming.alloy" % "alloy-core" % "0.3.14" % Test,
"software.amazon.smithy" % "smithy-aws-traits" % "1.53.0" % Test,
)
).pipe(jsoniterFix)
)
.dependsOn(
protocol4s,
Expand All @@ -194,12 +206,10 @@ lazy val lsp = module("lsp")
"io.circe" %% "circe-core" % "0.14.10",
"org.http4s" %% "http4s-ember-client" % "0.23.30",
"org.http4s" %% "http4s-ember-server" % "0.23.30" % Test,
("io.get-coursier" % "coursier" % "2.1.14")
.cross(CrossVersion.for3Use2_13)
.exclude("org.scala-lang.modules", "scala-collection-compat_2.13")
.exclude("com.github.plokhotnyuk.jsoniter-scala", "jsoniter-scala-core_2.13"),
("io.get-coursier" % "coursier_2.13" % "2.1.22")
.exclude("org.scala-lang.modules", "scala-collection-compat_2.13"),
"org.typelevel" %% "cats-tagless-core" % "0.16.2",
),
).pipe(jsoniterFix),
buildInfoPackage := "playground.lsp.buildinfo",
buildInfoKeys ++= Seq(version, scalaBinaryVersion),
(Test / test) := {
Expand Down

0 comments on commit 9e83f43

Please sign in to comment.