From faf33966bdc2d6ec6c731838031f12a1481c245a Mon Sep 17 00:00:00 2001 From: dwalend Date: Thu, 10 Oct 2024 17:41:22 -0400 Subject: [PATCH 01/14] Plan for fixing #1517 --- modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala | 3 +++ .../test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala | 1 + 2 files changed, 4 insertions(+) diff --git a/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala b/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala index 5c6e9646a..c1f10c349 100644 --- a/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala +++ b/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala @@ -30,6 +30,9 @@ private[codegen] object SmithyBuildJson { dependencies: ListSet[String], repositories: ListSet[String] ): String = { + //todo hard-code adding this dependency : com.disneystreaming.smithy4s:smithy4s-protocol + //com.disneystreaming.smithy4s:smithy4s-protocol:${BuildInfo.version} (where BuildInfo is smithy4s.codegen.BuildInfo + //todo so what do these dependency strings look like? SmithyBuild.writeJson( SmithyBuild.Serializable( version = "1.0", diff --git a/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala b/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala index c27447b5c..1a15afffb 100644 --- a/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala +++ b/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala @@ -22,6 +22,7 @@ import software.amazon.smithy.openapi.OpenApiVersion import scala.collection.immutable.ListSet +//todo all these should contain com.disneystreaming.smithy4s:smithy4s-protocol:${BuildInfo.version} final class SmithyBuildSpec extends munit.FunSuite { test("generate json") { val actual = SmithyBuild.writeJson( From ade87aa3bd03d99961cf7325dc5ca00cb4a63a78 Mon Sep 17 00:00:00 2001 From: dwalend Date: Thu, 10 Oct 2024 18:37:44 -0400 Subject: [PATCH 02/14] Fix for #1517 - smithy4s-protocol always included. --- .../smithy4s/codegen/SmithyBuildJson.scala | 8 ++--- .../codegen/internals/SmithyBuildSpec.scala | 33 +++++++++++++++++-- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala b/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala index c1f10c349..ab0538f96 100644 --- a/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala +++ b/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala @@ -25,20 +25,20 @@ import smithy4s.codegen.internals.SmithyBuildMavenRepository import scala.collection.immutable.ListSet private[codegen] object SmithyBuildJson { + + val protocolDependency = s"com.disneystreaming.smithy4s:smithy4s-protocol:${BuildInfo.version}" + def toJson( sources: ListSet[String], dependencies: ListSet[String], repositories: ListSet[String] ): String = { - //todo hard-code adding this dependency : com.disneystreaming.smithy4s:smithy4s-protocol - //com.disneystreaming.smithy4s:smithy4s-protocol:${BuildInfo.version} (where BuildInfo is smithy4s.codegen.BuildInfo - //todo so what do these dependency strings look like? SmithyBuild.writeJson( SmithyBuild.Serializable( version = "1.0", sources, SmithyBuildMaven( - dependencies, + dependencies+protocolDependency, repositories.map(SmithyBuildMavenRepository.apply) ) ) diff --git a/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala b/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala index 1a15afffb..b9e687875 100644 --- a/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala +++ b/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala @@ -16,15 +16,14 @@ package smithy4s.codegen.internals -import smithy4s.codegen.SmithyBuildJson +import smithy4s.codegen.{SmithyBuildJson,BuildInfo} import software.amazon.smithy.model.shapes.ShapeId import software.amazon.smithy.openapi.OpenApiVersion import scala.collection.immutable.ListSet -//todo all these should contain com.disneystreaming.smithy4s:smithy4s-protocol:${BuildInfo.version} final class SmithyBuildSpec extends munit.FunSuite { - test("generate json") { + test("generate json with SmithyBuild.writeJson") { val actual = SmithyBuild.writeJson( SmithyBuild.Serializable( "1.0", @@ -202,4 +201,32 @@ final class SmithyBuildSpec extends munit.FunSuite { assertEquals(Set.empty[os.FilePath], actual.sources.toSet) assertEquals(Set.empty[SmithyBuildPlugin], actual.plugins.toSet) } + + test("generate json with SmithyBuildJson.toJson") { + val actual = SmithyBuildJson.toJson( + ListSet("src/"), + ListSet("dep"), + ListSet("repo") + ) + assertEquals( + actual, + s"""|{ + | "version" : "1.0", + | "sources" : [ + | "src/" + | ], + | "maven" : { + | "dependencies" : [ + | "dep", + | "com.disneystreaming.smithy4s:smithy4s-protocol:${BuildInfo.version}" + | ], + | "repositories" : [ + | { + | "url" : "repo" + | } + | ] + | } + |}""".stripMargin + ) + } } From 1afd6dfbc2267d112623a69f7086c0ab1b9f6e88 Mon Sep 17 00:00:00 2001 From: dwalend Date: Fri, 11 Oct 2024 11:35:47 -0400 Subject: [PATCH 03/14] Fixed #1517 mill build test check the new dependency. --- .../test/src/smithy4s/codegen/mill/SmithyLSPConfigSpec.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/mill-codegen-plugin/test/src/smithy4s/codegen/mill/SmithyLSPConfigSpec.scala b/modules/mill-codegen-plugin/test/src/smithy4s/codegen/mill/SmithyLSPConfigSpec.scala index 0a5c4ba68..0c7a51cc3 100644 --- a/modules/mill-codegen-plugin/test/src/smithy4s/codegen/mill/SmithyLSPConfigSpec.scala +++ b/modules/mill-codegen-plugin/test/src/smithy4s/codegen/mill/SmithyLSPConfigSpec.scala @@ -67,7 +67,8 @@ class SmithyLSPConfigSpec extends munit.FunSuite { | "maven": { | "dependencies": [ | "com.disneystreaming.alloy:alloy-core:${smithy4s.codegen.BuildInfo.alloyVersion}", - | "software.amazon.smithy:smithy-aws-iam-traits:${smithy4s.codegen.BuildInfo.smithyVersion}" + | "software.amazon.smithy:smithy-aws-iam-traits:${smithy4s.codegen.BuildInfo.smithyVersion}", + | "com.disneystreaming.smithy4s:smithy4s-protocol:${smithy4s.codegen.BuildInfo.version}" | ], | "repositories": [ | { "url": "https://some.corpo.example.com/artifactory" } From 1b61b41490d808eba00038093591eeba0d54d7ec Mon Sep 17 00:00:00 2001 From: dwalend Date: Fri, 11 Oct 2024 17:47:59 -0400 Subject: [PATCH 04/14] scalafmt --- .../smithy4s/codegen/SmithyBuildJson.scala | 5 +-- .../codegen/internals/SmithyBuildSpec.scala | 34 +++++++++---------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala b/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala index ab0538f96..6485a51c4 100644 --- a/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala +++ b/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala @@ -26,7 +26,8 @@ import scala.collection.immutable.ListSet private[codegen] object SmithyBuildJson { - val protocolDependency = s"com.disneystreaming.smithy4s:smithy4s-protocol:${BuildInfo.version}" + val protocolDependency = + s"com.disneystreaming.smithy4s:smithy4s-protocol:${BuildInfo.version}" def toJson( sources: ListSet[String], @@ -38,7 +39,7 @@ private[codegen] object SmithyBuildJson { version = "1.0", sources, SmithyBuildMaven( - dependencies+protocolDependency, + dependencies + protocolDependency, repositories.map(SmithyBuildMavenRepository.apply) ) ) diff --git a/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala b/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala index b9e687875..89c6a5e35 100644 --- a/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala +++ b/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala @@ -16,7 +16,7 @@ package smithy4s.codegen.internals -import smithy4s.codegen.{SmithyBuildJson,BuildInfo} +import smithy4s.codegen.{SmithyBuildJson, BuildInfo} import software.amazon.smithy.model.shapes.ShapeId import software.amazon.smithy.openapi.OpenApiVersion @@ -211,22 +211,22 @@ final class SmithyBuildSpec extends munit.FunSuite { assertEquals( actual, s"""|{ - | "version" : "1.0", - | "sources" : [ - | "src/" - | ], - | "maven" : { - | "dependencies" : [ - | "dep", - | "com.disneystreaming.smithy4s:smithy4s-protocol:${BuildInfo.version}" - | ], - | "repositories" : [ - | { - | "url" : "repo" - | } - | ] - | } - |}""".stripMargin + | "version" : "1.0", + | "sources" : [ + | "src/" + | ], + | "maven" : { + | "dependencies" : [ + | "dep", + | "com.disneystreaming.smithy4s:smithy4s-protocol:${BuildInfo.version}" + | ], + | "repositories" : [ + | { + | "url" : "repo" + | } + | ] + | } + |}""".stripMargin ) } } From b8e15b504ebfa5d7eef8d80169509f1ad2b5dfb8 Mon Sep 17 00:00:00 2001 From: dwalend Date: Fri, 11 Oct 2024 17:53:56 -0400 Subject: [PATCH 05/14] Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3909041d..e52f6add7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ Thank you! * Fixes an issue in which union members targetting Unit would fail to compile when used as traits (see [#1600](https://github.com/disneystreaming/smithy4s/pull/1600)). * Make the `transform` method in generated `*Gen` algebras final. This should make it possible to derive e.g. `FunctorK` instances in cats-tagless automatically (see [#1588](https://github.com/disneystreaming/smithy4s/pull/1588)). * Fixes commons.toKebabCase() sometimes drops the first letter (see [#1603](https://github.com/disneystreaming/smithy4s/pull/1603)). +* Added com.disneystreaming.smithy4s:smithy4s-protocol dependency to mill LSP plugin (see [#1610](https://github.com/disneystreaming/smithy4s/pull/1610)). # 0.18.24 From 4e9788e3719575dbbcc2a7eb78d51b640f92f8bb Mon Sep 17 00:00:00 2001 From: dwalend Date: Sat, 12 Oct 2024 23:50:45 -0400 Subject: [PATCH 06/14] Fixed the scripted test --- .../update-lsp-config/build.sbt | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/build.sbt index 98b2f6270..65ae454dc 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/build.sbt @@ -2,23 +2,43 @@ import sbt.io.IO val subproj = project val subproj2 = project.enablePlugins(Smithy4sCodegenPlugin) - +// "com.disneystreaming.smithy4s:smithy4s-protocol:${smithy4sVersion.value}" val root = project .in(file(".")) .aggregate(subproj, subproj2) .settings( TaskKey[Unit]("checkSmithyBuild") := { val generated = IO.readLines(file(".") / "smithy-build.json") - val expected = IO.readLines(file(".") / "expected.json") + val expected = s"""{ + | "version" : "1.0", + | "sources" : [ + | "subproj2/src/main/smithy", + | "subproj2/target/scala-2.12/src_managed/main/smithy" + | ], + | "maven" : { + | "dependencies" : [ + | "com.disneystreaming.alloy:alloy-core:0.3.13", + | "com.disneystreaming.smithy4s:smithy4s-protocol:${smithy4sVersion.value}" + | ], + | "repositories" : [ + | { + | "url" : "https://oss.sonatype.org/content/repositories/snapshots" + | }, + | { + | "url" : "https://s01.oss.sonatype.org/content/repositories/snapshots" + | } + | ] + | } + |}""".stripMargin val compare = s"""|generated: |${generated.mkString("\n")} |=================================== |expected: - |${expected.mkString("\n")} + |${expected} |=================================== |""".stripMargin - assert(generated == expected, s"content are not the same:\n $compare") + assert(generated.mkString("\n") == expected, s"content are not the same:\n $compare") () } ) From 6b0a8b24ab37f548f582f4361bff633e303c7d10 Mon Sep 17 00:00:00 2001 From: David Walend Date: Mon, 14 Oct 2024 23:25:59 -0400 Subject: [PATCH 07/14] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Kozłowski --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e52f6add7..14d6e2860 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ Thank you! * Fixes an issue in which union members targetting Unit would fail to compile when used as traits (see [#1600](https://github.com/disneystreaming/smithy4s/pull/1600)). * Make the `transform` method in generated `*Gen` algebras final. This should make it possible to derive e.g. `FunctorK` instances in cats-tagless automatically (see [#1588](https://github.com/disneystreaming/smithy4s/pull/1588)). * Fixes commons.toKebabCase() sometimes drops the first letter (see [#1603](https://github.com/disneystreaming/smithy4s/pull/1603)). -* Added com.disneystreaming.smithy4s:smithy4s-protocol dependency to mill LSP plugin (see [#1610](https://github.com/disneystreaming/smithy4s/pull/1610)). +* Addes `com.disneystreaming.smithy4s:smithy4s-protocol dependency` to the generation of `smithy-build.json` in the `smithy4sUpdateLspConfig` tasks of the codegen plugins (see [#1610](https://github.com/disneystreaming/smithy4s/pull/1610)). # 0.18.24 From 5faef354473dd99ff3b4c5cf907f70fa071d7972 Mon Sep 17 00:00:00 2001 From: dwalend Date: Mon, 21 Oct 2024 18:09:10 -0400 Subject: [PATCH 08/14] Moved smithy4s org and protocol artifact name to build.sbt --- build.sbt | 4 +++- modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 5dfa989f8..e200ab66b 100644 --- a/build.sbt +++ b/build.sbt @@ -407,7 +407,9 @@ lazy val codegen = projectMatrix "smithyOrg" -> Dependencies.Smithy.org, "smithyVersion" -> Dependencies.Smithy.smithyVersion, "alloyOrg" -> Dependencies.Alloy.org, - "alloyVersion" -> Dependencies.Alloy.alloyVersion + "alloyVersion" -> Dependencies.Alloy.alloyVersion, + "smithy4sOrg" -> "com.disneystreaming.smithy4s", + "protocolArtifactName" -> "smithy4s-protocol", ), buildInfoPackage := "smithy4s.codegen", libraryDependencies ++= Seq( diff --git a/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala b/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala index 6485a51c4..63074074b 100644 --- a/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala +++ b/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala @@ -27,7 +27,7 @@ import scala.collection.immutable.ListSet private[codegen] object SmithyBuildJson { val protocolDependency = - s"com.disneystreaming.smithy4s:smithy4s-protocol:${BuildInfo.version}" + s"${BuildInfo.smithy4sOrg}:${BuildInfo.protocolArtifactName}:${BuildInfo.version}" def toJson( sources: ListSet[String], From 2f155a36858b0e8e30acd3b1b155d55c7a49e034 Mon Sep 17 00:00:00 2001 From: dwalend Date: Mon, 21 Oct 2024 22:21:45 -0400 Subject: [PATCH 09/14] Stray comment --- .../src/sbt-test/codegen-plugin/update-lsp-config/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/build.sbt index 65ae454dc..41ad1bde3 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/build.sbt @@ -2,7 +2,7 @@ import sbt.io.IO val subproj = project val subproj2 = project.enablePlugins(Smithy4sCodegenPlugin) -// "com.disneystreaming.smithy4s:smithy4s-protocol:${smithy4sVersion.value}" + val root = project .in(file(".")) .aggregate(subproj, subproj2) From 8947bcde51a30e0d89a9198ecf4f55f48c3fd196 Mon Sep 17 00:00:00 2001 From: dwalend Date: Mon, 21 Oct 2024 22:45:42 -0400 Subject: [PATCH 10/14] Change log typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 919c61368..8563c4968 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ Thank you! * Fixes an issue in which union members targetting Unit would fail to compile when used as traits (see [#1600](https://github.com/disneystreaming/smithy4s/pull/1600)). * Make the `transform` method in generated `*Gen` algebras final. This should make it possible to derive e.g. `FunctorK` instances in cats-tagless automatically (see [#1588](https://github.com/disneystreaming/smithy4s/pull/1588)). * Fixes commons.toKebabCase() sometimes drops the first letter (see [#1603](https://github.com/disneystreaming/smithy4s/pull/1603)). -* Addes `com.disneystreaming.smithy4s:smithy4s-protocol dependency` to the generation of `smithy-build.json` in the `smithy4sUpdateLspConfig` tasks of the codegen plugins (see [#1610](https://github.com/disneystreaming/smithy4s/pull/1610)). +* Adds `com.disneystreaming.smithy4s:smithy4s-protocol dependency` to the generation of `smithy-build.json` in the `smithy4sUpdateLspConfig` tasks of the codegen plugins (see [#1610](https://github.com/disneystreaming/smithy4s/pull/1610)). # 0.18.24 From d981b65d1870091862f8e9f907b3b96ca87c960e Mon Sep 17 00:00:00 2001 From: dwalend Date: Thu, 24 Oct 2024 10:18:52 -0400 Subject: [PATCH 11/14] Test cleanup --- .../update-lsp-config/build.sbt | 30 ++++--------------- .../update-lsp-config/expected.json | 3 +- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/build.sbt index 41ad1bde3..ae9e032ca 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/build.sbt @@ -8,37 +8,17 @@ val root = project .aggregate(subproj, subproj2) .settings( TaskKey[Unit]("checkSmithyBuild") := { - val generated = IO.readLines(file(".") / "smithy-build.json") - val expected = s"""{ - | "version" : "1.0", - | "sources" : [ - | "subproj2/src/main/smithy", - | "subproj2/target/scala-2.12/src_managed/main/smithy" - | ], - | "maven" : { - | "dependencies" : [ - | "com.disneystreaming.alloy:alloy-core:0.3.13", - | "com.disneystreaming.smithy4s:smithy4s-protocol:${smithy4sVersion.value}" - | ], - | "repositories" : [ - | { - | "url" : "https://oss.sonatype.org/content/repositories/snapshots" - | }, - | { - | "url" : "https://s01.oss.sonatype.org/content/repositories/snapshots" - | } - | ] - | } - |}""".stripMargin + val generated = IO.readLines(file(".") / "smithy-build.json").mkString("\n") + val expected = IO.readLines(file(".") / "expected.json").mkString("\n").replace("${SMITHY4S_VERSION}", smithy4sVersion.value) val compare = s"""|generated: - |${generated.mkString("\n")} + |$generated |=================================== |expected: - |${expected} + |$expected |=================================== |""".stripMargin - assert(generated.mkString("\n") == expected, s"content are not the same:\n $compare") + assert(generated == expected, s"content are not the same:\n $compare") () } ) diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/expected.json b/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/expected.json index 471476fcc..21fcaff7e 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/expected.json +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/expected.json @@ -6,7 +6,8 @@ ], "maven" : { "dependencies" : [ - "com.disneystreaming.alloy:alloy-core:0.3.13" + "com.disneystreaming.alloy:alloy-core:0.3.13", + "com.disneystreaming.smithy4s:smithy4s-protocol:${SMITHY4S_VERSION}" ], "repositories" : [ { From 00fbfe10b5e06e1789ad88fe99fb508bc375d0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 24 Oct 2024 16:53:25 +0200 Subject: [PATCH 12/14] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8563c4968..ea3778526 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ Thank you! * Optimises the conversion of empty smithy4s.Blob to fs2.Stream, to avoid performance degradation in Ember (see [#1609](https://github.com/disneystreaming/smithy4s/pull/1609)) * Adds utility types for working with endpoint handlers (see [#1612](https://github.com/disneystreaming/smithy4s/pull/1612)) +* * Adds `com.disneystreaming.smithy4s:smithy4s-protocol` dependency to the generation of `smithy-build.json` in the `smithy4sUpdateLSPConfig` tasks of the codegen plugins (see [#1610](https://github.com/disneystreaming/smithy4s/pull/1610)). # 0.18.25 @@ -19,7 +20,6 @@ Thank you! * Fixes an issue in which union members targetting Unit would fail to compile when used as traits (see [#1600](https://github.com/disneystreaming/smithy4s/pull/1600)). * Make the `transform` method in generated `*Gen` algebras final. This should make it possible to derive e.g. `FunctorK` instances in cats-tagless automatically (see [#1588](https://github.com/disneystreaming/smithy4s/pull/1588)). * Fixes commons.toKebabCase() sometimes drops the first letter (see [#1603](https://github.com/disneystreaming/smithy4s/pull/1603)). -* Adds `com.disneystreaming.smithy4s:smithy4s-protocol dependency` to the generation of `smithy-build.json` in the `smithy4sUpdateLspConfig` tasks of the codegen plugins (see [#1610](https://github.com/disneystreaming/smithy4s/pull/1610)). # 0.18.24 From e68c26270871b7933783ef26ebc86c04e6379d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 24 Oct 2024 18:41:35 +0200 Subject: [PATCH 13/14] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea3778526..3fbe41d54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ Thank you! * Optimises the conversion of empty smithy4s.Blob to fs2.Stream, to avoid performance degradation in Ember (see [#1609](https://github.com/disneystreaming/smithy4s/pull/1609)) * Adds utility types for working with endpoint handlers (see [#1612](https://github.com/disneystreaming/smithy4s/pull/1612)) -* * Adds `com.disneystreaming.smithy4s:smithy4s-protocol` dependency to the generation of `smithy-build.json` in the `smithy4sUpdateLSPConfig` tasks of the codegen plugins (see [#1610](https://github.com/disneystreaming/smithy4s/pull/1610)). +* Adds `com.disneystreaming.smithy4s:smithy4s-protocol` dependency to the generation of `smithy-build.json` in the `smithy4sUpdateLSPConfig` tasks of the codegen plugins (see [#1610](https://github.com/disneystreaming/smithy4s/pull/1610)). # 0.18.25 From 61aa6c88a52c72f988f187c6085e36d2e8523eee Mon Sep 17 00:00:00 2001 From: dwalend Date: Thu, 24 Oct 2024 12:52:12 -0400 Subject: [PATCH 14/14] Use the organization value from sbt's publishSettings . --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e200ab66b..d41ba47b4 100644 --- a/build.sbt +++ b/build.sbt @@ -408,7 +408,7 @@ lazy val codegen = projectMatrix "smithyVersion" -> Dependencies.Smithy.smithyVersion, "alloyOrg" -> Dependencies.Alloy.org, "alloyVersion" -> Dependencies.Alloy.alloyVersion, - "smithy4sOrg" -> "com.disneystreaming.smithy4s", + "smithy4sOrg" -> organization.value, "protocolArtifactName" -> "smithy4s-protocol", ), buildInfoPackage := "smithy4s.codegen",