Commit 77d751f
authored
chore(deps): bump aws-sdk-swift from 1.6.71 to 1.7.27 (#4234)
* chore(deps): bump aws-sdk-swift from 1.6.71 to 1.7.27
Updates the aws-sdk-swift dependency to 1.7.27, which moves the
transitive dependencies:
aws-crt-swift 0.58.1 -> 0.63.0
smithy-swift 0.191.0 -> 0.223.0
swift-http-types 1.5.1 -> 1.6.0
aws-sdk-swift 1.7.21+ relaxes its aws-crt-swift constraint from
exact: "0.61.1" to from: "0.63.0", so Amplify Swift and the AWS IoT
Device SDK for Swift can now coexist in the same project without an
aws-crt-swift version conflict.
swift-http-types is bumped to 1.6.0 because the transitively-updated
swift-nio-extras enables its new FoundationURL trait, which only exists
as of swift-http-types 1.6.0.
1.7.27 (smithy-swift 0.223.0) is required: smithy-swift's schema-based
JSON deserializer (introduced in 0.206.0) regressed null-value handling
for non-sparse maps, which broke deserialization of Cognito
RespondToAuthChallenge responses whose ChallengeParameters contain a
null value (e.g. "FRIENDLY_DEVICE_NAME": null in the SELECT_MFA_TYPE
challenge). smithy-swift 0.223.0 restores the prior behavior of
tolerating null values in non-sparse maps.
Resolves #4233
* ci: fix xcodebuild for smithy-swift build-tool plugin
smithy-swift 0.219.0 (pulled transitively by aws-sdk-swift 1.7.21)
ships the SmithyCodeGeneratorPlugin build-tool plugin, which aws-sdk-swift
attaches to every service target. Two independent issues broke CI builds
on the embedded simulator platforms (watchOS/tvOS):
1. Xcode requires package build-tool plugins to be trusted before use,
which can't happen non-interactively in CI:
Validate plug-in "SmithyCodeGeneratorPlugin" ... ** BUILD FAILED **
Fixed by passing -skipPackagePluginValidation.
2. Passing -sdk <simulator> forces xcodebuild to build the plugin's host
tool (SmithyCodegenCLI, an executableTarget) for the simulator SDK,
where it can't link:
Build input file cannot be found: '.../SmithyCodegenCLI'
The -destination already specifies the platform, so -sdk is redundant.
Removed it; the host tool now builds for macOS and the library for the
target. (The sdk input is retained for the coverage-export path.)
Both changes are required; dropping either re-breaks the watchOS/tvOS
builds for a different reason.
* test(auth): depend integration test bundles on a single host app
AuthIntegrationTests and AuthGen2IntegrationTests declared target
dependencies on BOTH AuthHostApp and AuthWatchApp. That pulled both
apps into a single build graph, and since both link Amplify /
AWSCognitoAuthPlugin (and transitively aws-sdk-swift), the new
SmithyCodeGeneratorPlugin ran twice for each SDK service target,
writing to the same aws-sdk-swift.output/<target>/ path:
Multiple commands produce '.../AWSCognitoIdentitySchemas.swift'
Every other plugin's host-app project depends each test bundle on a
single app (e.g. Geo -> GeoHostApp), which builds cleanly. Match that
structure: the iOS test bundles now depend only on AuthHostApp, and
the watch test bundle on AuthWatchApp.
Verified locally: 'xcodebuild build-for-testing -scheme
AuthIntegrationTests' now reports TEST BUILD SUCCEEDED.
* test: stop integration test bundles from re-linking SDK products
The integration XCTest bundles for Predictions, Kinesis/Firehose, and
the Analytics watchOS target linked the Amplify/aws-sdk-swift package
products directly (in both packageProductDependencies and the
Frameworks build phase), in addition to their host app linking them.
With smithy-swift 0.219.0's SmithyCodeGeneratorPlugin (pulled in by
aws-sdk-swift 1.7.21), this makes the build-tool plugin run twice for
each aws-sdk-swift service target — host app build + test bundle build —
both writing to the same package-keyed output directory:
Multiple commands produce '.../AWSCognitoIdentitySchemas.swift'
Build input files cannot be found: '.../InternalAWSCognitoIdentity...'
Passing projects (Geo, Storage, Logging, Analytics iOS/tvOS) link the
SDK products only from the app targets; their test bundles rely on the
host app via TEST_HOST. Match that: remove the redundant product links
from the affected test bundles.
Verified locally: AWSPredictionsPluginIntegrationTests and
AmplifyKinesisClientIntegrationTests now build with no plugin-output
collision (TEST BUILD SUCCEEDED).1 parent 37f9018 commit 77d751f
8 files changed
Lines changed: 27 additions & 92 deletions
File tree
- .github/composite_actions
- run_xcodebuild_test
- run_xcodebuild
- AmplifyClients/Tests/IntegrationTests/KinesisFirehoseClientHostApp/KinesisFirehoseClientHostApp.xcodeproj
- AmplifyPlugins
- Analytics/Tests/AnalyticsHostApp/AnalyticsHostApp.xcodeproj
- Auth/Tests/AuthHostApp/AuthHostApp.xcodeproj
- Predictions/Tests/PredictionsHostApp/PredictionsHostApp.xcodeproj
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | | - | |
| 74 | + | |
75 | 75 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
103 | | - | |
| 103 | + | |
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
| |||
Lines changed: 0 additions & 36 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | 10 | | |
22 | 11 | | |
23 | 12 | | |
24 | 13 | | |
25 | 14 | | |
26 | 15 | | |
27 | 16 | | |
28 | | - | |
29 | 17 | | |
30 | 18 | | |
31 | 19 | | |
| |||
115 | 103 | | |
116 | 104 | | |
117 | 105 | | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | 106 | | |
131 | 107 | | |
132 | 108 | | |
| |||
260 | 236 | | |
261 | 237 | | |
262 | 238 | | |
263 | | - | |
264 | | - | |
265 | | - | |
266 | | - | |
267 | | - | |
268 | | - | |
269 | | - | |
270 | | - | |
271 | | - | |
272 | | - | |
273 | | - | |
274 | | - | |
275 | 239 | | |
276 | 240 | | |
277 | 241 | | |
| |||
Lines changed: 0 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | 32 | | |
36 | 33 | | |
37 | 34 | | |
| |||
135 | 132 | | |
136 | 133 | | |
137 | 134 | | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | 135 | | |
142 | 136 | | |
143 | 137 | | |
| |||
334 | 328 | | |
335 | 329 | | |
336 | 330 | | |
337 | | - | |
338 | | - | |
339 | | - | |
340 | 331 | | |
341 | 332 | | |
342 | 333 | | |
| |||
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
570 | 570 | | |
571 | 571 | | |
572 | 572 | | |
573 | | - | |
574 | 573 | | |
575 | 574 | | |
576 | 575 | | |
| |||
614 | 613 | | |
615 | 614 | | |
616 | 615 | | |
617 | | - | |
618 | 616 | | |
619 | 617 | | |
620 | 618 | | |
| |||
Lines changed: 0 additions & 36 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | 56 | | |
69 | 57 | | |
70 | 58 | | |
| |||
139 | 127 | | |
140 | 128 | | |
141 | 129 | | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | 130 | | |
147 | 131 | | |
148 | 132 | | |
| |||
161 | 145 | | |
162 | 146 | | |
163 | 147 | | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | | - | |
168 | 148 | | |
169 | 149 | | |
170 | 150 | | |
171 | 151 | | |
172 | 152 | | |
173 | 153 | | |
174 | 154 | | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | 155 | | |
180 | 156 | | |
181 | 157 | | |
| |||
339 | 315 | | |
340 | 316 | | |
341 | 317 | | |
342 | | - | |
343 | | - | |
344 | | - | |
345 | | - | |
346 | 318 | | |
347 | 319 | | |
348 | 320 | | |
| |||
387 | 359 | | |
388 | 360 | | |
389 | 361 | | |
390 | | - | |
391 | | - | |
392 | | - | |
393 | | - | |
394 | 362 | | |
395 | 363 | | |
396 | 364 | | |
| |||
411 | 379 | | |
412 | 380 | | |
413 | 381 | | |
414 | | - | |
415 | | - | |
416 | | - | |
417 | | - | |
418 | 382 | | |
419 | 383 | | |
420 | 384 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
0 commit comments