Skip to content

Commit 6d73f3e

Browse files
committed
factor out the swift settings in package.swift
1 parent ec28c96 commit 6d73f3e

File tree

2 files changed

+27
-13
lines changed

2 files changed

+27
-13
lines changed

Package.swift

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
import PackageDescription
44

5+
let defaultSwiftSettings: [SwiftSetting] =
6+
[
7+
.swiftLanguageMode(.v6),
8+
// .enableExperimentalFeature(
9+
// "AvailabilityMacro=LambdaSwift 2.0:macOS 15.0"
10+
// ),
11+
//
12+
// then, in code, use
13+
// @available(LambdaSwift 2.0, *)
14+
]
15+
516
let package = Package(
617
name: "swift-aws-lambda-runtime",
718
platforms: [.macOS(.v15)],
@@ -43,7 +54,8 @@ let package = Package(
4354
package: "swift-service-lifecycle",
4455
condition: .when(traits: ["ServiceLifecycleSupport"])
4556
),
46-
]
57+
],
58+
swiftSettings: defaultSwiftSettings
4759
),
4860
.plugin(
4961
name: "AWSLambdaPackager",
@@ -67,8 +79,10 @@ let package = Package(
6779
.byName(name: "AWSLambdaRuntime"),
6880
.product(name: "NIOTestUtils", package: "swift-nio"),
6981
.product(name: "NIOFoundationCompat", package: "swift-nio"),
70-
]
82+
],
83+
swiftSettings: defaultSwiftSettings
7184
),
85+
7286
// for perf testing
7387
.executableTarget(
7488
name: "MockServer",
@@ -77,7 +91,8 @@ let package = Package(
7791
.product(name: "NIOHTTP1", package: "swift-nio"),
7892
.product(name: "NIOCore", package: "swift-nio"),
7993
.product(name: "NIOPosix", package: "swift-nio"),
80-
]
94+
],
95+
swiftSettings: defaultSwiftSettings
8196
),
8297
]
8398
)

[email protected]

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
import PackageDescription
44

5+
let defaultSwiftSettings: [SwiftSetting] = [
6+
.define("FoundationJSONSupport"),
7+
.define("ServiceLifecycleSupport"),
8+
.define("LocalServerSupport"),
9+
.swiftLanguageMode(.v6),
10+
]
11+
512
let package = Package(
613
name: "swift-aws-lambda-runtime",
714
platforms: [.macOS(.v15)],
@@ -28,11 +35,7 @@ let package = Package(
2835
.product(name: "NIOPosix", package: "swift-nio"),
2936
.product(name: "ServiceLifecycle", package: "swift-service-lifecycle"),
3037
],
31-
swiftSettings: [
32-
.define("FoundationJSONSupport"),
33-
.define("ServiceLifecycleSupport"),
34-
.define("LocalServerSupport"),
35-
]
38+
swiftSettings: defaultSwiftSettings
3639
),
3740
.plugin(
3841
name: "AWSLambdaPackager",
@@ -57,11 +60,7 @@ let package = Package(
5760
.product(name: "NIOTestUtils", package: "swift-nio"),
5861
.product(name: "NIOFoundationCompat", package: "swift-nio"),
5962
],
60-
swiftSettings: [
61-
.define("FoundationJSONSupport"),
62-
.define("ServiceLifecycleSupport"),
63-
.define("LocalServerSupport"),
64-
]
63+
swiftSettings: defaultSwiftSettings
6564
),
6665
// for perf testing
6766
.executableTarget(

0 commit comments

Comments
 (0)