From 8d76398a6179674fd307ec9806283cfa26c323ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 28 Oct 2024 23:45:53 +0100 Subject: [PATCH] Catch up on versions --- modules/core/src/test/scala/playground/Diffs.scala | 1 - .../resources/test-workspaces/default/smithy-build.json | 2 +- project/plugins.sbt | 9 ++------- smithy-build.json | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/modules/core/src/test/scala/playground/Diffs.scala b/modules/core/src/test/scala/playground/Diffs.scala index bdde6815..6e4ed076 100644 --- a/modules/core/src/test/scala/playground/Diffs.scala +++ b/modules/core/src/test/scala/playground/Diffs.scala @@ -24,7 +24,6 @@ object Diffs { _, ) => IdenticalValue("unit") - @nowarn("cat=unused") implicit def diffForIor[E: Diff, A: Diff]: Diff[Ior[E, A]] = Diff.derivedDiff implicit val diffByteArray: Diff[Blob] = Diff[String].contramap(_.toString()) diff --git a/modules/lsp/src/test/resources/test-workspaces/default/smithy-build.json b/modules/lsp/src/test/resources/test-workspaces/default/smithy-build.json index 9ef3d698..3498da9e 100644 --- a/modules/lsp/src/test/resources/test-workspaces/default/smithy-build.json +++ b/modules/lsp/src/test/resources/test-workspaces/default/smithy-build.json @@ -2,6 +2,6 @@ "sources": ["./weather.smithy", "./no-runner.smithy"], "mavenDependencies": [ "com.disneystreaming.alloy:alloy-core:0.3.14", - "com.disneystreaming.smithy4s:smithy4s-protocol:0.18.24" + "com.disneystreaming.smithy4s:smithy4s-protocol:0.18.25" ] } diff --git a/project/plugins.sbt b/project/plugins.sbt index b619d86f..b4014537 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,15 +1,10 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11") -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.3") - -// remove when smithy4s catches up: https://github.com/disneystreaming/smithy4s/pull/1485 + release -libraryDependencies ++= Seq( - "software.amazon.smithy" % "smithy-model" % "1.47.0" -) +addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2") // try to keep in sync with smithy-build.json -addSbtPlugin("com.disneystreaming.smithy4s" % "smithy4s-sbt-codegen" % "0.18.23") +addSbtPlugin("com.disneystreaming.smithy4s" % "smithy4s-sbt-codegen" % "0.18.25") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1") diff --git a/smithy-build.json b/smithy-build.json index 13314f88..2de3872b 100644 --- a/smithy-build.json +++ b/smithy-build.json @@ -2,7 +2,7 @@ "sources": ["modules/core/src/test/smithy"], "mavenDependencies": [ "com.disneystreaming.alloy:alloy-core:0.3.14", - "com.disneystreaming.smithy4s:smithy4s-protocol:0.18.24", + "com.disneystreaming.smithy4s:smithy4s-protocol:0.18.25", "software.amazon.smithy:smithy-aws-traits:1.52.1" ] }