Skip to content

Commit 2a4388b

Browse files
Andrea-ScuderiAndrea-Scuderi
committed
Update Swift 5.2.3
Update aws-sdk-swift to 5.0.0.alpha.3
1 parent 43fca4a commit 2a4388b

File tree

10 files changed

+95
-44
lines changed

10 files changed

+95
-44
lines changed

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
# Use this tag to build a customized local image
1616

17-
SWIFT_VERSION?=5.1.5
18-
LAYER_VERSION?=5-1-5
17+
SWIFT_VERSION?=5.2.3
18+
LAYER_VERSION?=5-2.3
1919

2020
DOCKER_TAG=nio-swift:$(SWIFT_VERSION)
2121
SWIFT_DOCKER_IMAGE=$(DOCKER_TAG)

‎Products/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Products/Package.resolved

Lines changed: 6 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Products/Package.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,18 @@ let package = Package(
1414
],
1515
dependencies: [
1616
.package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin", from: "1.0.0"),
17-
.package(url: "https://github.com/swift-aws/aws-sdk-swift.git", from: "4.0.0"),
17+
.package(url: "https://github.com/swift-aws/aws-sdk-swift.git", from: "5.0.0-alpha.3"),
1818
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
1919
],
2020
targets: [
2121
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
2222
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
2323
.target(
2424
name: "ProductService",
25-
dependencies: ["DynamoDB", "Logging"]
25+
dependencies: [
26+
.product(name: "AWSDynamoDB", package: "aws-sdk-swift"),
27+
"Logging"
28+
]
2629
),
2730
.target(
2831
name: "Products",

‎Products/Sources/ProductService/APIGateway.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
import Foundation
16-
import DynamoDB
16+
import AWSDynamoDB
1717
import NIO
1818
import LambdaSwiftSprinter
1919
import LambdaSwiftSprinterNioPlugin

‎Products/Sources/ProductService/Product+DynamoDB.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
import Foundation
16-
import DynamoDB
16+
import AWSDynamoDB
1717

1818
public struct ProductField {
1919
static let sku = "sku"

‎Products/Sources/ProductService/ProductService.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
import Foundation
16-
import DynamoDB
16+
import AWSDynamoDB
1717
import NIO
1818

1919
public enum APIError: Error {

‎Products/Sources/Products/main.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import FoundationNetworking
1818
#endif
1919
import LambdaSwiftSprinter
2020
import LambdaSwiftSprinterNioPlugin
21-
import DynamoDB
21+
import AWSDynamoDB
2222
import NIO
2323
import NIOHTTP1
2424
import ProductService
@@ -33,8 +33,8 @@ guard let tableName = ProcessInfo.processInfo.environment["PRODUCTS_TABLE_NAME"]
3333

3434
let region: Region
3535

36-
if let awsRegion = ProcessInfo.processInfo.environment["AWS_REGION"],
37-
let value = Region(rawValue: awsRegion) {
36+
if let awsRegion = ProcessInfo.processInfo.environment["AWS_REGION"] {
37+
let value = Region(rawValue: awsRegion)
3838
region = value
3939
logger.info("AWS_REGION: \(region)")
4040
} else {
@@ -43,7 +43,8 @@ if let awsRegion = ProcessInfo.processInfo.environment["AWS_REGION"],
4343
logger.info("AWS_REGION: us-east-1")
4444
}
4545

46-
let db = DynamoDB(region: region)
46+
let awsClient: AWSHTTPClient = httpClient as! AWSHTTPClient
47+
let db = DynamoDB(region: region, httpClientProvider: .shared(awsClient))
4748

4849
let service = ProductService(
4950
db: db,

‎docker/5.2.3/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM swift:5.2.3 as builder
2+
3+
RUN apt-get -qq update && apt-get -q -y install \
4+
libssl-dev libicu-dev

‎docker/5.2.3/swift-shared-libraries.txt

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/lib/x86_64-linux-gnu/libbsd.so.0
2+
/lib/x86_64-linux-gnu/libc.so.6
3+
/lib/x86_64-linux-gnu/libcom_err.so.2
4+
/lib/x86_64-linux-gnu/libcrypt.so.1
5+
/lib/x86_64-linux-gnu/libdl.so.2
6+
/lib/x86_64-linux-gnu/libgcc_s.so.1
7+
/lib/x86_64-linux-gnu/libkeyutils.so.1
8+
/lib/x86_64-linux-gnu/liblzma.so.5
9+
/lib/x86_64-linux-gnu/libm.so.6
10+
/lib/x86_64-linux-gnu/libpthread.so.0
11+
/lib/x86_64-linux-gnu/libresolv.so.2
12+
/lib/x86_64-linux-gnu/librt.so.1
13+
/lib/x86_64-linux-gnu/libutil.so.1
14+
/lib/x86_64-linux-gnu/libz.so.1
15+
/usr/lib/swift/linux/libBlocksRuntime.so
16+
/usr/lib/swift/linux/libFoundation.so
17+
/usr/lib/swift/linux/libFoundationNetworking.so
18+
/usr/lib/swift/linux/libFoundationXML.so
19+
/usr/lib/swift/linux/libdispatch.so
20+
/usr/lib/swift/linux/libicudataswift.so.65
21+
/usr/lib/swift/linux/libicui18nswift.so.65
22+
/usr/lib/swift/linux/libicuucswift.so.65
23+
/usr/lib/swift/linux/libswiftCore.so
24+
/usr/lib/swift/linux/libswiftDispatch.so
25+
/usr/lib/swift/linux/libswiftGlibc.so
26+
/usr/lib/swift/linux/libswiftSwiftOnoneSupport.so
27+
/usr/lib/x86_64-linux-gnu/libasn1.so.8
28+
/usr/lib/x86_64-linux-gnu/libatomic.so.1
29+
/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
30+
/usr/lib/x86_64-linux-gnu/libcurl.so.4
31+
/usr/lib/x86_64-linux-gnu/libffi.so.6
32+
/usr/lib/x86_64-linux-gnu/libgmp.so.10
33+
/usr/lib/x86_64-linux-gnu/libgnutls.so.30
34+
/usr/lib/x86_64-linux-gnu/libgssapi.so.3
35+
/usr/lib/x86_64-linux-gnu/libgssapi_krb5.so.2
36+
/usr/lib/x86_64-linux-gnu/libhcrypto.so.4
37+
/usr/lib/x86_64-linux-gnu/libheimbase.so.1
38+
/usr/lib/x86_64-linux-gnu/libheimntlm.so.0
39+
/usr/lib/x86_64-linux-gnu/libhogweed.so.4
40+
/usr/lib/x86_64-linux-gnu/libhx509.so.5
41+
/usr/lib/x86_64-linux-gnu/libicudata.so.60
42+
/usr/lib/x86_64-linux-gnu/libicuuc.so.60
43+
/usr/lib/x86_64-linux-gnu/libidn2.so.0
44+
/usr/lib/x86_64-linux-gnu/libk5crypto.so.3
45+
/usr/lib/x86_64-linux-gnu/libkrb5.so.26
46+
/usr/lib/x86_64-linux-gnu/libkrb5.so.3
47+
/usr/lib/x86_64-linux-gnu/libkrb5support.so.0
48+
/usr/lib/x86_64-linux-gnu/liblber-2.4.so.2
49+
/usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2
50+
/usr/lib/x86_64-linux-gnu/libnettle.so.6
51+
/usr/lib/x86_64-linux-gnu/libnghttp2.so.14
52+
/usr/lib/x86_64-linux-gnu/libp11-kit.so.0
53+
/usr/lib/x86_64-linux-gnu/libpsl.so.5
54+
/usr/lib/x86_64-linux-gnu/libroken.so.18
55+
/usr/lib/x86_64-linux-gnu/librtmp.so.1
56+
/usr/lib/x86_64-linux-gnu/libsasl2.so.2
57+
/usr/lib/x86_64-linux-gnu/libsqlite3.so.0
58+
/usr/lib/x86_64-linux-gnu/libssl.so.1.1
59+
/usr/lib/x86_64-linux-gnu/libstdc++.so.6
60+
/usr/lib/x86_64-linux-gnu/libtasn1.so.6
61+
/usr/lib/x86_64-linux-gnu/libunistring.so.2
62+
/usr/lib/x86_64-linux-gnu/libwind.so.0
63+
/usr/lib/x86_64-linux-gnu/libxml2.so.2

0 commit comments

Comments
 (0)