Move smithy files to another module

Author: kubukoz

app/src/main/scala/com/kubukoz/next/Program.scala

@@ -13,9 +13,7 @@ import cats.implicits.*
 import com.kubukoz.next.Spotify.DeviceInfo
 import com.kubukoz.next.api.sonos
 import com.kubukoz.next.sonos.SonosApi
-import com.kubukoz.next.sonos.SonosApiGen
 import com.kubukoz.next.spotify.SpotifyApi
-import com.kubukoz.next.spotify.SpotifyApiGen
 import com.kubukoz.next.util.Config
 import com.kubukoz.next.util.Config.Token
 import com.kubukoz.next.util.middlewares
@@ -107,8 +105,8 @@ object Program {
     val spotifyBaseUri = com.kubukoz.next.api.spotify.baseUri
 
     for {
-      given SpotifyApi[F] <- SimpleRestJsonBuilder(SpotifyApiGen).client[F](spotifyClient).uri(spotifyBaseUri).make.liftTo[F]
-      given SonosApi[F]   <- SimpleRestJsonBuilder(SonosApiGen).client[F](sonosClient).uri(sonos.baseUri).make.liftTo[F]
+      given SpotifyApi[F] <- SimpleRestJsonBuilder(SpotifyApi).client[F](spotifyClient).uri(spotifyBaseUri).make.liftTo[F]
+      given SonosApi[F]   <- SimpleRestJsonBuilder(SonosApi).client[F](sonosClient).uri(sonos.baseUri).make.liftTo[F]
       result              <- makeSpotifyInternal[F]
     } yield result
   }

build.sbt

@@ -116,8 +116,23 @@ val front = project
   .dependsOn(core)
  */
 
+lazy val smithyModels = crossProject(JVMPlatform, NativePlatform)
+  .crossType(CrossType.Pure)
+  .in(file("smithy-models"))
+  .settings(
+    commonSettings,
+    libraryDependencies ++= Seq(
+      "com.disneystreaming.smithy4s" %%% "smithy4s-core" % smithy4sVersion.value
+    )
+  )
+  .enablePlugins(Smithy4sCodegenPlugin)
+  .settings(
+    Compile / smithy4sInputDirs := Seq((ThisBuild / baseDirectory).value / "smithy-models" / "src" / "main" / "smithy")
+  )
+
 val app = crossProject(JVMPlatform, NativePlatform)
   .crossType(CrossType.Pure)
+  .dependsOn(smithyModels)
   .settings(commonSettings)
   .settings(
     libraryDependencies ++= Seq(
@@ -139,10 +154,6 @@ val app = crossProject(JVMPlatform, NativePlatform)
   )
   .settings(name := "spotify-next")
   .enablePlugins(BuildInfoPlugin)
-  .settings(
-    Compile / smithy4sInputDirs := Seq((ThisBuild / baseDirectory).value / "app" / "src" / "main" / "smithy")
-  )
-  .enablePlugins(Smithy4sCodegenPlugin)
   .jvmConfigure(
     _.settings(
       libraryDependencies ++= Seq(
@@ -162,4 +173,4 @@ val root =
   project
     .in(file("."))
     .enablePlugins(NoPublishPlugin)
-    .aggregate(app.componentProjects.map(p => p: ProjectReference): _*)
+    .aggregate(List(app, smithyModels).flatMap(_.componentProjects).map(p => p: ProjectReference): _*)

smithy-build.json

@@ -1,11 +1,14 @@
 {
-  "version": "1.0",
-  "sources": ["app/src/main/smithy"],
-  "maven": {
-    "dependencies": [
-      "com.disneystreaming.alloy:alloy-core:0.3.13",
-      "com.disneystreaming.smithy4s:smithy4s-protocol:0.18.31"
+    "version" : "1.0",
+    "sources" : [
+        "smithy-models/src/main/smithy"
     ],
-    "repositories": []
-  }
-}
+    "maven" : {
+        "dependencies" : [
+            "com.disneystreaming.alloy:alloy-core:0.3.13",
+            "com.disneystreaming.smithy4s:smithy4s-protocol:0.18.31"
+        ],
+        "repositories" : [
+        ]
+    }
+}