Skip to content

Commit 6885aa7

Browse files
authored
Merge branch 'master' into move-samples
2 parents 8fd702a + 1d96372 commit 6885aa7

25 files changed

+1279
-262
lines changed

Package.swift

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ let package = Package(
88
.macOS(.v10_13),
99
],
1010
products: [
11-
// core library
11+
// this library exports `AWSLambdaRuntimeCore` and adds Foundation convenience methods
1212
.library(name: "AWSLambdaRuntime", targets: ["AWSLambdaRuntime"]),
13+
// this has all the main functionality for lambda and it does not link Foundation
14+
.library(name: "AWSLambdaRuntimeCore", targets: ["AWSLambdaRuntimeCore"]),
1315
// common AWS events
1416
.library(name: "AWSLambdaEvents", targets: ["AWSLambdaEvents"]),
1517
// for testing only
@@ -22,23 +24,40 @@ let package = Package(
2224
],
2325
targets: [
2426
.target(name: "AWSLambdaRuntime", dependencies: [
27+
.byName(name: "AWSLambdaRuntimeCore"),
28+
.product(name: "NIO", package: "swift-nio"),
29+
.product(name: "NIOFoundationCompat", package: "swift-nio"),
30+
]),
31+
.target(name: "AWSLambdaRuntimeCore", dependencies: [
2532
.product(name: "Logging", package: "swift-log"),
2633
.product(name: "Backtrace", package: "swift-backtrace"),
2734
.product(name: "NIOHTTP1", package: "swift-nio"),
28-
.product(name: "NIOFoundationCompat", package: "swift-nio"),
2935
]),
30-
.testTarget(name: "AWSLambdaRuntimeTests", dependencies: ["AWSLambdaRuntime"]),
36+
.testTarget(name: "AWSLambdaRuntimeCoreTests", dependencies: [
37+
.byName(name: "AWSLambdaRuntimeCore"),
38+
]),
39+
.testTarget(name: "AWSLambdaRuntimeTests", dependencies: [
40+
.byName(name: "AWSLambdaRuntimeCore"),
41+
.byName(name: "AWSLambdaRuntime"),
42+
]),
3143
.target(name: "AWSLambdaEvents", dependencies: []),
3244
.testTarget(name: "AWSLambdaEventsTests", dependencies: ["AWSLambdaEvents"]),
3345
// testing helper
3446
.target(name: "AWSLambdaTesting", dependencies: [
35-
"AWSLambdaRuntime",
47+
.byName(name: "AWSLambdaRuntime"),
3648
.product(name: "NIO", package: "swift-nio"),
3749
]),
38-
.testTarget(name: "AWSLambdaTestingTests", dependencies: ["AWSLambdaTesting"]),
50+
.testTarget(name: "AWSLambdaTestingTests", dependencies: [
51+
.byName(name: "AWSLambdaTesting"),
52+
.byName(name: "AWSLambdaRuntime"),
53+
]),
3954
// samples
40-
.target(name: "StringSample", dependencies: ["AWSLambdaRuntime"]),
41-
.target(name: "CodableSample", dependencies: ["AWSLambdaRuntime"]),
55+
.target(name: "StringSample", dependencies: [
56+
.byName(name: "AWSLambdaRuntime"),
57+
]),
58+
.target(name: "CodableSample", dependencies: [
59+
.byName(name: "AWSLambdaRuntime"),
60+
]),
4261
// perf tests
4362
.target(name: "MockServer", dependencies: [
4463
.product(name: "NIOHTTP1", package: "swift-nio"),

0 commit comments

Comments
 (0)