move AWSLambdaRuntimeService to a separate module to avoid penalty fo…

…r functions not using it
swift-server · Jan 9, 2025 · 01a4443 · 01a4443
1 parent cc89338
commit 01a4443
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/Examples/ServiceLifeCycle/Package.swift b/Examples/ServiceLifeCycle/Package.swift
@@ -17,11 +17,9 @@ let package = Package(
         .package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.6.3"),
     ],
     targets: [
-        // Targets are the basic building blocks of a package, defining a module or a test suite.
-        // Targets can depend on other targets in this package and products from dependencies.
         .executableTarget(name: "pg", dependencies: [
             .product(name: "PostgresNIO", package: "postgres-nio"),
-            .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
+            .product(name: "AWSLambdaRuntimeService", package: "swift-aws-lambda-runtime"),
             .product(name: "ServiceLifecycle", package: "swift-service-lifecycle")
         ]),
     ]

diff --git a/Examples/ServiceLifeCycle/Sources/Lambda.swift b/Examples/ServiceLifeCycle/Sources/Lambda.swift
@@ -1,4 +1,4 @@
-import AWSLambdaRuntime
+import AWSLambdaRuntimeService
 import Logging
 import PostgresNIO
 import ServiceLifecycle

diff --git a/Package.swift b/Package.swift
@@ -8,11 +8,17 @@ let package = Package(
     products: [
         // this library exports `AWSLambdaRuntimeCore` and adds Foundation convenience methods
         .library(name: "AWSLambdaRuntime", targets: ["AWSLambdaRuntime"]),
+
+        // this library exports `AWSLambdaRuntime` and adds conformances to `Service` from Swift Service Lifecycle
+        .library(name: "AWSLambdaRuntimeService", targets: ["AWSLambdaRuntimeService"]),
+
         // this has all the main functionality for lambda and it does not link Foundation
         .library(name: "AWSLambdaRuntimeCore", targets: ["AWSLambdaRuntimeCore"]),
+
         // plugin to package the lambda, creating an archive that can be uploaded to AWS
         // requires Linux or at least macOS v15
         .plugin(name: "AWSLambdaPackager", targets: ["AWSLambdaPackager"]),
+
         // for testing only
         .library(name: "AWSLambdaTesting", targets: ["AWSLambdaTesting"]),
     ],
@@ -22,12 +28,18 @@ let package = Package(
         .package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.6.3"),
     ],
     targets: [
+        .target(
+            name: "AWSLambdaRuntimeService",
+            dependencies: [
+                .byName(name: "AWSLambdaRuntime"),
+                .product(name: "ServiceLifecycle", package: "swift-service-lifecycle"),
+            ]
+        ),
         .target(
             name: "AWSLambdaRuntime",
             dependencies: [
                 .byName(name: "AWSLambdaRuntimeCore"),
                 .product(name: "NIOCore", package: "swift-nio"),
-                .product(name: "ServiceLifecycle", package: "swift-service-lifecycle"),
             ]
         ),
         .target(

diff --git a/...time/LambdaRuntime+ServiceLifeCycle.swift → ...vice/LambdaRuntime+ServiceLifeCycle.swift b/...time/LambdaRuntime+ServiceLifeCycle.swift → ...vice/LambdaRuntime+ServiceLifeCycle.swift
@@ -12,8 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_exported import AWSLambdaRuntimeCore
-import NIOCore
+@_exported import AWSLambdaRuntime
 
 import ServiceLifecycle
 #if canImport(FoundationEssentials)