Skip to content

Commit a6bf92f

Browse files
harsh62harsh62
committed
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 da4b531 commit a6bf92f

3 files changed

Lines changed: 0 additions & 81 deletions

File tree

  • AmplifyClients/Tests/IntegrationTests/KinesisFirehoseClientHostApp/KinesisFirehoseClientHostApp.xcodeproj
  • AmplifyPlugins
    • Analytics/Tests/AnalyticsHostApp/AnalyticsHostApp.xcodeproj
    • Predictions/Tests/PredictionsHostApp/PredictionsHostApp.xcodeproj

‎AmplifyClients/Tests/IntegrationTests/KinesisFirehoseClientHostApp/KinesisFirehoseClientHostApp.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,13 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
EA3C8E912F5070AC003FF786 /* AmplifyKinesisClient in Frameworks */ = {isa = PBXBuildFile; productRef = EA3C8E902F5070AC003FF786 /* AmplifyKinesisClient */; };
11-
EA3C8E932F5070AC003FF786 /* AWSPluginsCore in Frameworks */ = {isa = PBXBuildFile; productRef = EA3C8E922F5070AC003FF786 /* AWSPluginsCore */; };
12-
EA3C8E952F5070AC003FF786 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = EA3C8E942F5070AC003FF786 /* Amplify */; };
13-
EA3C8E972F5070AC003FF786 /* AmplifyFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = EA3C8E962F5070AC003FF786 /* AmplifyFoundation */; };
14-
EA3C8E992F5070AC003FF786 /* AmplifyFoundationBridge in Frameworks */ = {isa = PBXBuildFile; productRef = EA3C8E982F5070AC003FF786 /* AmplifyFoundationBridge */; };
15-
EA3C8EA22F50809E003FF786 /* AmplifyKinesisClient in Frameworks */ = {isa = PBXBuildFile; productRef = EA3C8EA12F50809E003FF786 /* AmplifyKinesisClient */; };
16-
EA3C8EA42F50809E003FF786 /* AWSPluginsCore in Frameworks */ = {isa = PBXBuildFile; productRef = EA3C8EA32F50809E003FF786 /* AWSPluginsCore */; };
17-
EA3C8EA62F50809E003FF786 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = EA3C8EA52F50809E003FF786 /* Amplify */; };
18-
EA3C8EA82F50809E003FF786 /* AmplifyFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = EA3C8EA72F50809E003FF786 /* AmplifyFoundation */; };
19-
EA3C8EAA2F50809E003FF786 /* AmplifyFoundationBridge in Frameworks */ = {isa = PBXBuildFile; productRef = EA3C8EA92F50809E003FF786 /* AmplifyFoundationBridge */; };
20-
EA3C8EAE2F5080EA003FF786 /* AmplifyFirehoseClient in Frameworks */ = {isa = PBXBuildFile; productRef = EA3C8EAD2F5080EA003FF786 /* AmplifyFirehoseClient */; };
2110
EA67FA502F7E893400D4A710 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = EA67FA4F2F7E893400D4A710 /* AWSCognitoAuthPlugin */; };
2211
EA67FA522F7E893400D4A710 /* AWSPluginsCore in Frameworks */ = {isa = PBXBuildFile; productRef = EA67FA512F7E893400D4A710 /* AWSPluginsCore */; };
2312
EA67FA542F7E893400D4A710 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = EA67FA532F7E893400D4A710 /* Amplify */; };
2413
EA67FA562F7E893400D4A710 /* AmplifyFirehoseClient in Frameworks */ = {isa = PBXBuildFile; productRef = EA67FA552F7E893400D4A710 /* AmplifyFirehoseClient */; };
2514
EA67FA582F7E893400D4A710 /* AmplifyFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = EA67FA572F7E893400D4A710 /* AmplifyFoundation */; };
2615
EA67FA5A2F7E893400D4A710 /* AmplifyFoundationBridge in Frameworks */ = {isa = PBXBuildFile; productRef = EA67FA592F7E893400D4A710 /* AmplifyFoundationBridge */; };
2716
EA67FA5C2F7E893400D4A710 /* AmplifyKinesisClient in Frameworks */ = {isa = PBXBuildFile; productRef = EA67FA5B2F7E893400D4A710 /* AmplifyKinesisClient */; };
28-
EA67FA5E2F7E897100D4A710 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = EA67FA5D2F7E897100D4A710 /* AWSCognitoAuthPlugin */; };
2917
/* End PBXBuildFile section */
3018

3119
/* Begin PBXContainerItemProxy section */
@@ -115,18 +103,6 @@
115103
isa = PBXFrameworksBuildPhase;
116104
buildActionMask = 2147483647;
117105
files = (
118-
EA3C8EA22F50809E003FF786 /* AmplifyKinesisClient in Frameworks */,
119-
EA3C8EA62F50809E003FF786 /* Amplify in Frameworks */,
120-
EA3C8EA82F50809E003FF786 /* AmplifyFoundation in Frameworks */,
121-
EA3C8EAA2F50809E003FF786 /* AmplifyFoundationBridge in Frameworks */,
122-
EA3C8EA42F50809E003FF786 /* AWSPluginsCore in Frameworks */,
123-
EA3C8E952F5070AC003FF786 /* Amplify in Frameworks */,
124-
EA3C8E932F5070AC003FF786 /* AWSPluginsCore in Frameworks */,
125-
EA3C8E972F5070AC003FF786 /* AmplifyFoundation in Frameworks */,
126-
EA3C8E992F5070AC003FF786 /* AmplifyFoundationBridge in Frameworks */,
127-
EA3C8EAE2F5080EA003FF786 /* AmplifyFirehoseClient in Frameworks */,
128-
EA3C8E912F5070AC003FF786 /* AmplifyKinesisClient in Frameworks */,
129-
EA67FA5E2F7E897100D4A710 /* AWSCognitoAuthPlugin in Frameworks */,
130106
);
131107
runOnlyForDeploymentPostprocessing = 0;
132108
};
@@ -260,18 +236,6 @@
260236
);
261237
name = AmplifyKinesisClientIntegrationTests;
262238
packageProductDependencies = (
263-
EA3C8E902F5070AC003FF786 /* AmplifyKinesisClient */,
264-
EA3C8E922F5070AC003FF786 /* AWSPluginsCore */,
265-
EA3C8E942F5070AC003FF786 /* Amplify */,
266-
EA3C8E962F5070AC003FF786 /* AmplifyFoundation */,
267-
EA3C8E982F5070AC003FF786 /* AmplifyFoundationBridge */,
268-
EA3C8EA12F50809E003FF786 /* AmplifyKinesisClient */,
269-
EA3C8EA32F50809E003FF786 /* AWSPluginsCore */,
270-
EA3C8EA52F50809E003FF786 /* Amplify */,
271-
EA3C8EA72F50809E003FF786 /* AmplifyFoundation */,
272-
EA3C8EA92F50809E003FF786 /* AmplifyFoundationBridge */,
273-
EA3C8EAD2F5080EA003FF786 /* AmplifyFirehoseClient */,
274-
EA67FA5D2F7E897100D4A710 /* AWSCognitoAuthPlugin */,
275239
);
276240
productName = AmplifyKinesisClientIntegrationTests;
277241
productReference = EA6AF6972F506E3500D372FB /* AmplifyKinesisClientIntegrationTests.xctest */;

‎AmplifyPlugins/Analytics/Tests/AnalyticsHostApp/AnalyticsHostApp.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
68DBE9592A3B6EAE002B73E3 /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737697229519DEC0074B63A /* XCTestCase+AsyncTesting.swift */; };
3030
68DBE95A2A3B6EAE002B73E3 /* AWSPinpointAnalyticsPluginIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6857647828AE95ED000CE2E9 /* AWSPinpointAnalyticsPluginIntegrationTests.swift */; };
3131
68DBE95B2A3B6EAE002B73E3 /* TestConfigHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6857648828AE9951000CE2E9 /* TestConfigHelper.swift */; };
32-
68DBE9662A3B6F2A002B73E3 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 68DBE9652A3B6F2A002B73E3 /* Amplify */; };
33-
68DBE9682A3B6F2A002B73E3 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68DBE9672A3B6F2A002B73E3 /* AWSCognitoAuthPlugin */; };
34-
68DBE96A2A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68DBE9692A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin */; };
3532
9737697629519E050074B63A /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737697029519DEC0074B63A /* AsyncTesting.swift */; };
3633
9737697729519E050074B63A /* AsyncExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737697129519DEC0074B63A /* AsyncExpectation.swift */; };
3734
9737697829519E050074B63A /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737697229519DEC0074B63A /* XCTestCase+AsyncTesting.swift */; };
@@ -135,9 +132,6 @@
135132
isa = PBXFrameworksBuildPhase;
136133
buildActionMask = 2147483647;
137134
files = (
138-
68DBE9662A3B6F2A002B73E3 /* Amplify in Frameworks */,
139-
68DBE96A2A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin in Frameworks */,
140-
68DBE9682A3B6F2A002B73E3 /* AWSCognitoAuthPlugin in Frameworks */,
141135
);
142136
runOnlyForDeploymentPostprocessing = 0;
143137
};
@@ -334,9 +328,6 @@
334328
);
335329
name = AWSPinpointAnalyticsPluginIntegrationTestsWatch;
336330
packageProductDependencies = (
337-
68DBE9652A3B6F2A002B73E3 /* Amplify */,
338-
68DBE9672A3B6F2A002B73E3 /* AWSCognitoAuthPlugin */,
339-
68DBE9692A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin */,
340331
);
341332
productName = AWSPinpointAnalyticsPluginIntegrationTests;
342333
productReference = 68DBE9622A3B6EAE002B73E3 /* AWSPinpointAnalyticsPluginIntegrationTestsWatch.xctest */;

‎AmplifyPlugins/Predictions/Tests/PredictionsHostApp/PredictionsHostApp.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,6 @@
5353
90542370291425630000D108 /* testImageCeleb.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 90542363291425630000D108 /* testImageCeleb.jpg */; };
5454
90542371291425630000D108 /* testImageTextForms.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 90542364291425630000D108 /* testImageTextForms.jpg */; };
5555
90542372291425630000D108 /* audio.wav in Resources */ = {isa = PBXBuildFile; fileRef = 90542365291425630000D108 /* audio.wav */; };
56-
90CF304A2AD47A71006B6FF3 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF30492AD47A71006B6FF3 /* Amplify */; };
57-
90CF304C2AD47A74006B6FF3 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF304B2AD47A74006B6FF3 /* Amplify */; };
58-
90CF304E2AD47A78006B6FF3 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF304D2AD47A78006B6FF3 /* Amplify */; };
59-
90CF30502AD47B0E006B6FF3 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF304F2AD47B0E006B6FF3 /* AWSCognitoAuthPlugin */; };
60-
90CF30522AD47B0E006B6FF3 /* AWSPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF30512AD47B0E006B6FF3 /* AWSPredictionsPlugin */; };
61-
90CF30542AD47B0E006B6FF3 /* CoreMLPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF30532AD47B0E006B6FF3 /* CoreMLPredictionsPlugin */; };
62-
90CF30562AD47B19006B6FF3 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF30552AD47B19006B6FF3 /* AWSCognitoAuthPlugin */; };
63-
90CF30582AD47B19006B6FF3 /* AWSPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF30572AD47B19006B6FF3 /* AWSPredictionsPlugin */; };
64-
90CF305A2AD47B19006B6FF3 /* CoreMLPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF30592AD47B19006B6FF3 /* CoreMLPredictionsPlugin */; };
65-
90CF305C2AD47B24006B6FF3 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF305B2AD47B24006B6FF3 /* AWSCognitoAuthPlugin */; };
66-
90CF305E2AD47B24006B6FF3 /* AWSPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF305D2AD47B24006B6FF3 /* AWSPredictionsPlugin */; };
67-
90CF30602AD47B24006B6FF3 /* CoreMLPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF305F2AD47B24006B6FF3 /* CoreMLPredictionsPlugin */; };
6856
/* End PBXBuildFile section */
6957

7058
/* Begin PBXContainerItemProxy section */
@@ -139,10 +127,6 @@
139127
isa = PBXFrameworksBuildPhase;
140128
buildActionMask = 2147483647;
141129
files = (
142-
90CF30602AD47B24006B6FF3 /* CoreMLPredictionsPlugin in Frameworks */,
143-
90CF304E2AD47A78006B6FF3 /* Amplify in Frameworks */,
144-
90CF305E2AD47B24006B6FF3 /* AWSPredictionsPlugin in Frameworks */,
145-
90CF305C2AD47B24006B6FF3 /* AWSCognitoAuthPlugin in Frameworks */,
146130
);
147131
runOnlyForDeploymentPostprocessing = 0;
148132
};
@@ -161,21 +145,13 @@
161145
isa = PBXFrameworksBuildPhase;
162146
buildActionMask = 2147483647;
163147
files = (
164-
90CF30542AD47B0E006B6FF3 /* CoreMLPredictionsPlugin in Frameworks */,
165-
90CF304A2AD47A71006B6FF3 /* Amplify in Frameworks */,
166-
90CF30522AD47B0E006B6FF3 /* AWSPredictionsPlugin in Frameworks */,
167-
90CF30502AD47B0E006B6FF3 /* AWSCognitoAuthPlugin in Frameworks */,
168148
);
169149
runOnlyForDeploymentPostprocessing = 0;
170150
};
171151
903555F529141355004B83C2 /* Frameworks */ = {
172152
isa = PBXFrameworksBuildPhase;
173153
buildActionMask = 2147483647;
174154
files = (
175-
90CF305A2AD47B19006B6FF3 /* CoreMLPredictionsPlugin in Frameworks */,
176-
90CF304C2AD47A74006B6FF3 /* Amplify in Frameworks */,
177-
90CF30582AD47B19006B6FF3 /* AWSPredictionsPlugin in Frameworks */,
178-
90CF30562AD47B19006B6FF3 /* AWSCognitoAuthPlugin in Frameworks */,
179155
);
180156
runOnlyForDeploymentPostprocessing = 0;
181157
};
@@ -339,10 +315,6 @@
339315
);
340316
name = AWSPredictionsPluginIntegrationTestsWatch;
341317
packageProductDependencies = (
342-
90CF304D2AD47A78006B6FF3 /* Amplify */,
343-
90CF305B2AD47B24006B6FF3 /* AWSCognitoAuthPlugin */,
344-
90CF305D2AD47B24006B6FF3 /* AWSPredictionsPlugin */,
345-
90CF305F2AD47B24006B6FF3 /* CoreMLPredictionsPlugin */,
346318
);
347319
productName = AWSPredictionsPluginIntegrationTests;
348320
productReference = 6875F9242A3CCCB7001C9AAF /* AWSPredictionsPluginIntegrationTestsWatch.xctest */;
@@ -387,10 +359,6 @@
387359
);
388360
name = CoreMLPredictionsPluginIntegrationTests;
389361
packageProductDependencies = (
390-
90CF30492AD47A71006B6FF3 /* Amplify */,
391-
90CF304F2AD47B0E006B6FF3 /* AWSCognitoAuthPlugin */,
392-
90CF30512AD47B0E006B6FF3 /* AWSPredictionsPlugin */,
393-
90CF30532AD47B0E006B6FF3 /* CoreMLPredictionsPlugin */,
394362
);
395363
productName = CoreMLPredictionsPluginIntegrationTests;
396364
productReference = 90283033291402D500897087 /* CoreMLPredictionsPluginIntegrationTests.xctest */;
@@ -411,10 +379,6 @@
411379
);
412380
name = AWSPredictionsPluginIntegrationTests;
413381
packageProductDependencies = (
414-
90CF304B2AD47A74006B6FF3 /* Amplify */,
415-
90CF30552AD47B19006B6FF3 /* AWSCognitoAuthPlugin */,
416-
90CF30572AD47B19006B6FF3 /* AWSPredictionsPlugin */,
417-
90CF30592AD47B19006B6FF3 /* CoreMLPredictionsPlugin */,
418382
);
419383
productName = AWSPredictionsPluginIntegrationTests;
420384
productReference = 903555F829141355004B83C2 /* AWSPredictionsPluginIntegrationTests.xctest */;

0 commit comments

Comments
 (0)