Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit 446fc9c

Browse files
Andrea-ScuderiAndrea-Scuderi
committed
Add import FoundationNetworking when Linux and Swift >= 5.1
Fix HTTPSRequest Fix HelloWorld TODO S3Test - Broken
1 parent ec041f8 commit 446fc9c

File tree

12 files changed

+147
-10
lines changed

12 files changed

+147
-10
lines changed

‎Examples/HTTPSRequest/Package.resolved‎

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

‎Examples/HTTPSRequest/Package.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ let package = Package(
88
dependencies: [
99
// Dependencies declare other packages that this package depends on.
1010
//.package(path: "../../../aws-lambda-swift-sprinter-nio-plugin"),
11-
.package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin", from: "1.0.0-alpha.1")
11+
//.package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin", from: "1.0.0-alpha.1")
12+
.package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin", .branch("feature/swift-5.1")),
1213
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
1314
],
1415
targets: [

‎Examples/HTTPSRequest/Sources/HTTPSRequest/main.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
import AsyncHTTPClient
1616
import Foundation
17+
#if swift(>=5.1) && os(Linux)
18+
import FoundationNetworking
19+
#endif
1720
import LambdaSwiftSprinter
1821
import LambdaSwiftSprinterNioPlugin
1922
import Logging

‎Examples/HelloWorld/Package.resolved‎

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

‎Examples/HelloWorld/Package.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ let package = Package(
88
dependencies: [
99
// Dependencies declare other packages that this package depends on.
1010
//.package(path: "../../../aws-lambda-swift-sprinter-core"),
11-
.package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core", from: "1.0.0-alpha.1")
11+
//.package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core", from: "1.0.0-alpha.1")
12+
.package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core", .branch("feature/swift-5.1")),
1213
],
1314
targets: [
1415
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

‎Examples/HelloWorld/Sources/HelloWorld/main.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
// limitations under the License.
1414

1515
import Foundation
16+
#if swift(>=5.1) && os(Linux)
17+
import FoundationNetworking
18+
#endif
1619
import LambdaSwiftSprinter
1720

1821
struct Event: Codable {

‎Examples/S3Test/Package.resolved‎

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

‎Examples/S3Test/Package.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ let package = Package(
88
// Dependencies declare other packages that this package depends on.
99
// .package(url: /* package url */, from: "1.0.0"),
1010
//.package(path: "../../../aws-lambda-swift-sprinter-core"),
11-
.package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core", from: "1.0.0-alpha.1")
11+
//.package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core", from: "1.0.0-alpha.1")
12+
.package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core", .branch("feature/swift-5.1")),
1213
.package(url: "https://github.com/swift-aws/aws-sdk-swift.git", .branch("nio2.0")),
1314
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
1415
],

‎Examples/S3Test/Sources/S3Test/main.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
// limitations under the License.
1414

1515
import Foundation
16+
#if swift(>=5.1) && os(Linux)
17+
import FoundationNetworking
18+
#endif
1619
import LambdaSwiftSprinter
1720
import Logging
1821
import S3

‎Makefile‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,83 @@ clean_layer:
116116
rm $(LAYER_ZIP) || true
117117
rm -r $(SHARED_LIBS_FOLDER) || true
118118

119+
package_layer_5_0: clean_layer create_build_directory
120+
mkdir -p $(SHARED_LIBS_FOLDER)/lib
121+
docker run \
122+
--rm \
123+
--volume "$(shell pwd)/:/src" \
124+
--workdir "/src" \
125+
$(SWIFT_DOCKER_IMAGE) \
126+
cp /lib64/ld-linux-x86-64.so.2 $(SHARED_LIBS_FOLDER)
127+
docker run \
128+
--rm \
129+
--volume "$(shell pwd)/:/src" \
130+
--workdir "/src" \
131+
$(SWIFT_DOCKER_IMAGE) \
132+
cp -t $(SHARED_LIBS_FOLDER)/lib \
133+
/lib/x86_64-linux-gnu/libbsd.so.0 \
134+
/lib/x86_64-linux-gnu/libc.so.6 \
135+
/lib/x86_64-linux-gnu/libcom_err.so.2 \
136+
/lib/x86_64-linux-gnu/libcrypt.so.1 \
137+
/lib/x86_64-linux-gnu/libdl.so.2 \
138+
/lib/x86_64-linux-gnu/libgcc_s.so.1 \
139+
/lib/x86_64-linux-gnu/libkeyutils.so.1 \
140+
/lib/x86_64-linux-gnu/liblzma.so.5 \
141+
/lib/x86_64-linux-gnu/libm.so.6 \
142+
/lib/x86_64-linux-gnu/libpthread.so.0 \
143+
/lib/x86_64-linux-gnu/libresolv.so.2 \
144+
/lib/x86_64-linux-gnu/librt.so.1 \
145+
/lib/x86_64-linux-gnu/libutil.so.1 \
146+
/lib/x86_64-linux-gnu/libz.so.1 \
147+
/usr/lib/swift/linux/libBlocksRuntime.so \
148+
/usr/lib/swift/linux/libFoundation.so \
149+
/usr/lib/swift/linux/libdispatch.so \
150+
/usr/lib/swift/linux/libicudataswift.so.61 \
151+
/usr/lib/swift/linux/libicui18nswift.so.61 \
152+
/usr/lib/swift/linux/libicuucswift.so.61 \
153+
/usr/lib/swift/linux/libswiftCore.so \
154+
/usr/lib/swift/linux/libswiftDispatch.so \
155+
/usr/lib/swift/linux/libswiftGlibc.so \
156+
/usr/lib/swift/linux/libswiftSwiftOnoneSupport.so \
157+
/usr/lib/x86_64-linux-gnu/libasn1.so.8 \
158+
/usr/lib/x86_64-linux-gnu/libatomic.so.1 \
159+
/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 \
160+
/usr/lib/x86_64-linux-gnu/libcurl.so.4 \
161+
/usr/lib/x86_64-linux-gnu/libffi.so.6 \
162+
/usr/lib/x86_64-linux-gnu/libgmp.so.10 \
163+
/usr/lib/x86_64-linux-gnu/libgnutls.so.30 \
164+
/usr/lib/x86_64-linux-gnu/libgssapi.so.3 \
165+
/usr/lib/x86_64-linux-gnu/libgssapi_krb5.so.2 \
166+
/usr/lib/x86_64-linux-gnu/libhcrypto.so.4 \
167+
/usr/lib/x86_64-linux-gnu/libheimbase.so.1 \
168+
/usr/lib/x86_64-linux-gnu/libheimntlm.so.0 \
169+
/usr/lib/x86_64-linux-gnu/libhogweed.so.4 \
170+
/usr/lib/x86_64-linux-gnu/libhx509.so.5 \
171+
/usr/lib/x86_64-linux-gnu/libicudata.so.60 \
172+
/usr/lib/x86_64-linux-gnu/libicuuc.so.60 \
173+
/usr/lib/x86_64-linux-gnu/libidn2.so.0 \
174+
/usr/lib/x86_64-linux-gnu/libk5crypto.so.3 \
175+
/usr/lib/x86_64-linux-gnu/libkrb5.so.26 \
176+
/usr/lib/x86_64-linux-gnu/libkrb5.so.3 \
177+
/usr/lib/x86_64-linux-gnu/libkrb5support.so.0 \
178+
/usr/lib/x86_64-linux-gnu/liblber-2.4.so.2 \
179+
/usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2 \
180+
/usr/lib/x86_64-linux-gnu/libnettle.so.6 \
181+
/usr/lib/x86_64-linux-gnu/libnghttp2.so.14 \
182+
/usr/lib/x86_64-linux-gnu/libp11-kit.so.0 \
183+
/usr/lib/x86_64-linux-gnu/libpsl.so.5 \
184+
/usr/lib/x86_64-linux-gnu/libroken.so.18 \
185+
/usr/lib/x86_64-linux-gnu/librtmp.so.1 \
186+
/usr/lib/x86_64-linux-gnu/libsasl2.so.2 \
187+
/usr/lib/x86_64-linux-gnu/libsqlite3.so.0 \
188+
/usr/lib/x86_64-linux-gnu/libssl.so.1.1 \
189+
/usr/lib/x86_64-linux-gnu/libstdc++.so.6 \
190+
/usr/lib/x86_64-linux-gnu/libtasn1.so.6 \
191+
/usr/lib/x86_64-linux-gnu/libunistring.so.2 \
192+
/usr/lib/x86_64-linux-gnu/libwind.so.0 \
193+
/usr/lib/x86_64-linux-gnu/libxml2.so.2
194+
zip -r $(LAMBDA_BUILD_PATH)/$(LAYER_ZIP) bootstrap $(SHARED_LIBS_FOLDER)
195+
119196
package_layer: clean_layer create_build_directory
120197
mkdir -p $(SHARED_LIBS_FOLDER)/lib
121198
docker run \
@@ -154,6 +231,7 @@ package_layer: clean_layer create_build_directory
154231
/usr/lib/swift/linux/libswiftDispatch.so \
155232
/usr/lib/swift/linux/libswiftGlibc.so \
156233
/usr/lib/swift/linux/libswiftSwiftOnoneSupport.so \
234+
/usr/lib/swift/linux/libFoundationNetworking.so \
157235
/usr/lib/x86_64-linux-gnu/libasn1.so.8 \
158236
/usr/lib/x86_64-linux-gnu/libatomic.so.1 \
159237
/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 \

0 commit comments

Comments
 (0)