Add a dependency tracking mechanism

build.sbt

@@ -111,7 +111,7 @@ lazy val docs =
         Dependencies.Http4s.emberServer.value,
         Dependencies.Decline.effect.value
       ),
-      Compile / genSmithyDependencies ++= Seq(Dependencies.Smithy.testTraits),
+      Compile / smithy4sDependencies ++= Seq(Dependencies.Smithy.testTraits),
       Compile / sourceGenerators := Seq(genSmithyScala(Compile).taskValue),
       Compile / smithySpecs := Seq(
         (Compile / sourceDirectory).value / "smithy",
@@ -160,7 +160,7 @@ lazy val core = projectMatrix
       "smithy.waiters",
       "alloy"
     ),
-    genSmithyDependencies ++= Seq(
+    smithy4sDependencies ++= Seq(
       Dependencies.Smithy.waiters
     ),
     Compile / sourceGenerators := Seq(genSmithyScala(Compile).taskValue),
@@ -261,7 +261,7 @@ lazy val `aws-kernel` = projectMatrix
       Dependencies.Weaver.cats.value % Test,
       Dependencies.Weaver.scalacheck.value % Test
     ),
-    genSmithyDependencies ++= Seq(Dependencies.Smithy.awsTraits),
+    smithy4sDependencies ++= Seq(Dependencies.Smithy.awsTraits),
     Compile / allowedNamespaces := Seq(
       "aws.api",
       "aws.auth",
@@ -328,7 +328,7 @@ lazy val `aws-http4s` = projectMatrix
         Dependencies.Http4s.emberClient.value % Test
       )
     },
-    Test / genSmithyDependencies ++= Seq(
+    Test / smithy4sDependencies ++= Seq(
       Dependencies.Smithy.waiters,
       Dependencies.Smithy.awsTraits
     ),
@@ -710,7 +710,7 @@ lazy val complianceTests = projectMatrix
   .settings(
     name := "compliance-tests",
     Compile / allowedNamespaces := Seq("smithy.test", "smithy4s.example.test"),
-    Compile / genSmithyDependencies ++= Seq(Dependencies.Smithy.testTraits),
+    Compile / smithy4sDependencies ++= Seq(Dependencies.Smithy.testTraits),
     Compile / sourceGenerators := Seq(genSmithyScala(Compile).taskValue),
     isCE3 := virtualAxes.value.contains(CatsEffect3Axis),
     libraryDependencies ++= {
@@ -825,146 +825,6 @@ lazy val benchmark = projectMatrix
   .jvmPlatform(List(Scala213), jvmDimSettings)
   .settings(Smithy4sBuildPlugin.doNotPublishArtifact)
 
-val isCE3 = settingKey[Boolean]("Is the current build using CE3?")
-
-lazy val Dependencies = new {
-
-  val collectionsCompat =
-    Def.setting(
-      "org.scala-lang.modules" %%% "scala-collection-compat" % "2.8.1"
-    )
-
-  val Jsoniter =
-    Def.setting(
-      "com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-core" % "2.17.9"
-    )
-
-  val Smithy = new {
-    val org = "software.amazon.smithy"
-    val version = "1.26.0"
-    val model = org % "smithy-model" % version
-    val testTraits = org % "smithy-protocol-test-traits" % version
-    val build = org % "smithy-build" % version
-    val awsTraits = org % "smithy-aws-traits" % version
-    val waiters = org % "smithy-waiters" % version
-  }
-
-  val Alloy = new {
-    val org = "com.disneystreaming.alloy"
-    val version = "0.1.0"
-    val core = org % "alloy-core" % version
-    val openapi = org %% "alloy-openapi" % version
-  }
-
-  val Cats = new {
-    val core: Def.Initialize[ModuleID] =
-      Def.setting("org.typelevel" %%% "cats-core" % "2.8.0")
-  }
-
-  object Decline {
-    val declineVersion = "2.3.1"
-
-    val core = Def.setting("com.monovore" %%% "decline" % declineVersion)
-    val effect =
-      Def.setting("com.monovore" %%% "decline-effect" % declineVersion)
-  }
-  object Fs2 {
-    val core: Def.Initialize[ModuleID] =
-      Def.setting("co.fs2" %%% "fs2-core" % "3.3.0")
-  }
-
-  object Mill {
-    val millVersion = "0.10.7"
-
-    val scalalib = "com.lihaoyi" %% "mill-scalalib" % millVersion
-    val main = "com.lihaoyi" %% "mill-main" % millVersion
-    val mainApi = "com.lihaoyi" %% "mill-main-api" % millVersion
-    val mainTestkit = "com.lihaoyi" %% "mill-main-testkit" % millVersion % Test
-  }
-
-  val Circe = new {
-    val generic: Def.Initialize[ModuleID] =
-      Def.setting("io.circe" %%% "circe-generic" % "0.14.3")
-  }
-
-  /*
-   * we override the version to use the fix included in
-   * https://github.com/typelevel/cats-effect/pull/2945
-   * it allows us to use UUIDGen instead of calling
-   * UUID.randomUUID manually
-   *
-   * we also provide a 2.12 shim under:
-   * modules/tests/src-ce2/UUIDGen.scala
-   */
-  val CatsEffect3: Def.Initialize[ModuleID] =
-    Def.setting("org.typelevel" %%% "cats-effect" % "3.3.14")
-
-  object Http4s {
-    val http4sVersion = Def.setting(if (isCE3.value) "0.23.16" else "0.22.14")
-
-    val emberServer: Def.Initialize[ModuleID] =
-      Def.setting("org.http4s" %%% "http4s-ember-server" % http4sVersion.value)
-    val emberClient: Def.Initialize[ModuleID] =
-      Def.setting("org.http4s" %%% "http4s-ember-client" % http4sVersion.value)
-    val circe: Def.Initialize[ModuleID] =
-      Def.setting("org.http4s" %%% "http4s-circe" % http4sVersion.value)
-    val core: Def.Initialize[ModuleID] =
-      Def.setting("org.http4s" %%% "http4s-core" % http4sVersion.value)
-    val dsl: Def.Initialize[ModuleID] =
-      Def.setting("org.http4s" %%% "http4s-dsl" % http4sVersion.value)
-    val client: Def.Initialize[ModuleID] =
-      Def.setting("org.http4s" %%% "http4s-client" % http4sVersion.value)
-  }
-
-  object Weaver {
-
-    val weaverVersion = Def.setting(if (isCE3.value) "0.8.0" else "0.6.15")
-
-    val cats: Def.Initialize[ModuleID] =
-      Def.setting("com.disneystreaming" %%% "weaver-cats" % weaverVersion.value)
-
-    val scalacheck: Def.Initialize[ModuleID] =
-      Def.setting(
-        "com.disneystreaming" %%% "weaver-scalacheck" % weaverVersion.value
-      )
-  }
-
-  class MunitCross(munitVersion: String) {
-    val core: Def.Initialize[ModuleID] =
-      Def.setting("org.scalameta" %%% "munit" % munitVersion)
-    val scalacheck: Def.Initialize[ModuleID] =
-      Def.setting("org.scalameta" %%% "munit-scalacheck" % munitVersion)
-  }
-  object Munit extends MunitCross("0.7.29")
-  object MunitMilestone extends MunitCross("1.0.0-M6")
-
-  val Scalacheck = new {
-    val version = "1.16.0"
-    val scalacheck =
-      Def.setting("org.scalacheck" %%% "scalacheck" % version)
-  }
-
-  object Webjars {
-    val swaggerUi: ModuleID = "org.webjars.npm" % "swagger-ui-dist" % "4.15.2"
-
-    val webjarsLocator: ModuleID = "org.webjars" % "webjars-locator" % "0.42"
-  }
-
-}
-
-lazy val smithySpecs = SettingKey[Seq[File]]("smithySpecs")
-lazy val genSmithyOutput = SettingKey[File]("genSmithyOutput")
-lazy val genSmithyResourcesOutput = SettingKey[File]("genSmithyResourcesOutput")
-lazy val allowedNamespaces = SettingKey[Seq[String]]("allowedNamespaces")
-lazy val genSmithyDependencies =
-  SettingKey[Seq[ModuleID]]("genSmithyDependencies")
-
-(ThisBuild / genSmithyDependencies) := Seq(Dependencies.Alloy.core)
-
-lazy val smithy4sSkip = SettingKey[Seq[String]]("smithy4sSkip")
-
-(ThisBuild / smithySpecs) := Seq.empty
-
 def genSmithyScala(config: Configuration) = genSmithyImpl(config).map(_._1)
 def genSmithyResources(config: Configuration) = genSmithyImpl(config).map(_._2)
 
@@ -983,8 +843,8 @@ def genSmithyImpl(config: Configuration) = Def.task {
       .getAbsolutePath()
   val allowedNS = (config / allowedNamespaces).?.value.filterNot(_.isEmpty)
   val skip = (config / smithy4sSkip).?.value.getOrElse(Seq.empty)
-  val smithy4sDependencies =
-    (config / genSmithyDependencies).?.value.getOrElse(Seq.empty).map {
+  val smithy4sDeps =
+    (config / smithy4sDependencies).?.value.getOrElse(Seq.empty).map {
       moduleId =>
         s"${moduleId.organization}:${moduleId.name}:${moduleId.revision}"
     }
@@ -1063,8 +923,8 @@ def genSmithyImpl(config: Configuration) = Def.task {
                 else Nil
               val skipOpt = skip.flatMap(s => List("--skip", s))
               val dependenciesOpt =
-                if (smithy4sDependencies.nonEmpty)
-                  List("--dependencies", smithy4sDependencies.mkString(","))
+                if (smithy4sDeps.nonEmpty)
+                  List("--dependencies", smithy4sDeps.mkString(","))
                 else Nil
               val args = outputOpt ++
                 resourceOutputOpt ++

modules/codegen-plugin/src/sbt-test/codegen-plugin/dependencies-only/build.sbt

@@ -6,6 +6,6 @@ lazy val p1 = project
       "aws.iam"
     ),
     libraryDependencies += "com.disneystreaming.smithy4s" %% "smithy4s-core" % smithy4sVersion.value,
-    libraryDependencies += "software.amazon.smithy" % "smithy-aws-iam-traits" % smithy4s.codegen.BuildInfo.smithyVersion % Smithy4sCompile,
+    libraryDependencies += "software.amazon.smithy" % "smithy-aws-iam-traits" % smithy4s.codegen.BuildInfo.smithyVersion % Smithy4s,
     Compile / smithy4sOutputDir := baseDirectory.value / "smithy_output"
   )

modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-aws/build.sbt

@@ -6,7 +6,6 @@ lazy val foo = (project in file("foo"))
   .enablePlugins(Smithy4sCodegenPlugin)
   .settings(
     libraryDependencies ++= Seq(
-      "software.amazon.smithy" % "smithy-aws-traits" % smithyVersion % Smithy4s,
       "com.disneystreaming.smithy4s" %% "smithy4s-aws-kernel" % smithy4sVersion.value
     )
   )

modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-no-compile/build.sbt

@@ -4,5 +4,5 @@ lazy val foo = (project in file("foo"))
 
 lazy val bar = (project in file("bar"))
   .enablePlugins(Smithy4sCodegenPlugin)
-  .settings(Compile / smithy4sLocalJars := Nil)
+  .settings(Compile / smithy4sInternalDependenciesAsJars := Nil)
   .dependsOn(foo)

modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-staged/bar/src/main/scala/Test.scala

@@ -20,6 +20,8 @@ import foo._
 
 object BarTest {
 
-  def main(args: Array[String]): Unit = println(Bar(Some(Foo(Some(1)))))
+  def main(args: Array[String]): Unit = {
+    println(Bar(Some(Foo(Some(1)))))
+  }
 
 }

modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-staged/bar/src/main/smithy/bar.smithy

@@ -3,8 +3,10 @@ $version: "2.0"
 namespace bar
 
 use foo#Foo
+use aws.api#data
 
 // Checking that Foo can be found by virtue of the bar project depending on the foo project
+@data("tagging")
 structure Bar {
   foo: Foo
 }

modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-staged/build.sbt

@@ -1,19 +1,28 @@
+import smithy4s.codegen.BuildInfo.smithyVersion
+
 ThisBuild / scalaVersion := "2.13.10"
 ThisBuild / version := "0.0.1-SNAPSHOT"
 ThisBuild / organization := "foobar"
 
 lazy val foo = (project in file("foo"))
   .enablePlugins(Smithy4sCodegenPlugin)
   .settings(
+    // foo refers to smithy-aws-traits explicitly as a code-gen only dep, and upon publishing,
+    // this information is stored in the manifest of bar's jar, for downstream consumption
+    smithy4sAllowedNamespaces := List("aws.api", "foo"),
     libraryDependencies ++= Seq(
-      "com.disneystreaming.smithy4s" %% "smithy4s-core" % smithy4sVersion.value
+      "com.disneystreaming.smithy4s" %% "smithy4s-core" % smithy4sVersion.value,
+      "software.amazon.smithy" % "smithy-aws-traits" % smithy4s.codegen.BuildInfo.smithyVersion % Smithy4s
     )
   )
 
 lazy val bar = (project in file("bar"))
   .enablePlugins(Smithy4sCodegenPlugin)
   .settings(
+    // bar depend on foo as a library, and an assumption is made that bar may depend on the same smithy models
+    // that foo depended on for its own codegen. Therefore, these are retrieved from foo's manifest,
+    // resolved and added to the list of jars to seek smithy models from during code generation
     libraryDependencies ++= Seq(
-      "foobar" %% "foo" % version.value % Smithy4sCompile
+      "foobar" %% "foo" % version.value
     )
   )

modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-staged/foo/src/main/smithy/foo.smithy

@@ -3,10 +3,12 @@ $version: "2.0"
 namespace foo
 
 use alloy#uuidFormat
+use aws.api#data
 
 structure Foo {
   a: Integer
 }
 
+@data("tagging")
 @uuidFormat
 string MyUUID