Skip to content

Commit 84e5342

Browse files
andrewheardandrewheard
authored
[Firebase AI] Replace xcodeproj groups with folders in integration tests (#15499)
1 parent f0555c6 commit 84e5342

File tree

1 file changed

+45
-138
lines changed

1 file changed

+45
-138
lines changed

‎FirebaseAI/Tests/TestApp/FirebaseAITestApp.xcodeproj/project.pbxproj‎

Lines changed: 45 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,14 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 60;
6+
objectVersion = 77;
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
0E0481222EA2E51300A50172 /* DataUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E0481212EA2E51100A50172 /* DataUtils.swift */; };
11-
0E460FAB2E9858E4007E26A6 /* LiveSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E460FAA2E9858E4007E26A6 /* LiveSessionTests.swift */; };
12-
0EC8BAE22E98784E0075A4E0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 868A7C532CCC26B500E449DD /* Assets.xcassets */; };
13-
862218812D04E098007ED2D4 /* IntegrationTestUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 862218802D04E08D007ED2D4 /* IntegrationTestUtils.swift */; };
14-
864F8F712D4980DD0002EA7E /* ImagenIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 864F8F702D4980D60002EA7E /* ImagenIntegrationTests.swift */; };
15-
8661385C2CC943DD00F4B78E /* TestApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8661385B2CC943DD00F4B78E /* TestApp.swift */; };
16-
8661385E2CC943DD00F4B78E /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8661385D2CC943DD00F4B78E /* ContentView.swift */; };
17-
8661386E2CC943DE00F4B78E /* IntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8661386D2CC943DE00F4B78E /* IntegrationTests.swift */; };
18-
8689CDCC2D7F8BD700BF426B /* CountTokensIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8689CDCB2D7F8BCF00BF426B /* CountTokensIntegrationTests.swift */; };
19-
868A7C482CCA931B00E449DD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 868A7C462CCA931B00E449DD /* GoogleService-Info.plist */; };
20-
868A7C4F2CCC229F00E449DD /* Credentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = 868A7C4D2CCC1F4700E449DD /* Credentials.swift */; };
21-
868A7C522CCC263300E449DD /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 868A7C502CCC263300E449DD /* Preview Assets.xcassets */; };
22-
868A7C542CCC26B500E449DD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 868A7C532CCC26B500E449DD /* Assets.xcassets */; };
23-
8698D7482CD4332B00ABA833 /* TestAppCheckProviderFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8698D7472CD4332B00ABA833 /* TestAppCheckProviderFactory.swift */; };
24-
86CC31352D91EE9E0087E964 /* FirebaseAppUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86CC31342D91EE9E0087E964 /* FirebaseAppUtils.swift */; };
25-
86D77DFC2D7A5340003D155D /* GenerateContentIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86D77DFB2D7A5340003D155D /* GenerateContentIntegrationTests.swift */; };
26-
86D77DFE2D7B5C86003D155D /* GoogleService-Info-Spark.plist in Resources */ = {isa = PBXBuildFile; fileRef = 86D77DFD2D7B5C86003D155D /* GoogleService-Info-Spark.plist */; };
27-
86D77E022D7B63AF003D155D /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86D77E012D7B63AC003D155D /* Constants.swift */; };
28-
86D77E042D7B6C9D003D155D /* InstanceConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86D77E032D7B6C95003D155D /* InstanceConfig.swift */; };
2910
86E8505B2DBAFBC3002E8D94 /* FirebaseAI in Frameworks */ = {isa = PBXBuildFile; productRef = 86E8505A2DBAFBC3002E8D94 /* FirebaseAI */; };
3011
86E8505D2DBAFBC3002E8D94 /* FirebaseAppCheck in Frameworks */ = {isa = PBXBuildFile; productRef = 86E8505C2DBAFBC3002E8D94 /* FirebaseAppCheck */; };
3112
86E8505F2DBAFBC3002E8D94 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 86E8505E2DBAFBC3002E8D94 /* FirebaseAuth */; };
3213
86E850612DBAFBC3002E8D94 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 86E850602DBAFBC3002E8D94 /* FirebaseStorage */; };
33-
DEF0BB4F2DA74F680093E9F4 /* TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF0BB4E2DA74F460093E9F4 /* TestHelpers.swift */; };
34-
DEF0BB512DA9B7450093E9F4 /* SchemaTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF0BB502DA9B7400093E9F4 /* SchemaTests.swift */; };
35-
DEF4634B2EA1AA77004E79B1 /* ServerPromptTemplateIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF4634A2EA1AA77004E79B1 /* ServerPromptTemplateIntegrationTests.swift */; };
3614
/* End PBXBuildFile section */
3715

3816
/* Begin PBXContainerItemProxy section */
@@ -46,32 +24,41 @@
4624
/* End PBXContainerItemProxy section */
4725

4826
/* Begin PBXFileReference section */
49-
0E0481212EA2E51100A50172 /* DataUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataUtils.swift; sourceTree = "<group>"; };
50-
0E460FAA2E9858E4007E26A6 /* LiveSessionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveSessionTests.swift; sourceTree = "<group>"; };
51-
862218802D04E08D007ED2D4 /* IntegrationTestUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegrationTestUtils.swift; sourceTree = "<group>"; };
52-
864F8F702D4980D60002EA7E /* ImagenIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagenIntegrationTests.swift; sourceTree = "<group>"; };
5327
866138582CC943DD00F4B78E /* FirebaseAITestApp-SPM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FirebaseAITestApp-SPM.app"; sourceTree = BUILT_PRODUCTS_DIR; };
54-
8661385B2CC943DD00F4B78E /* TestApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestApp.swift; sourceTree = "<group>"; };
55-
8661385D2CC943DD00F4B78E /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
5628
866138692CC943DE00F4B78E /* IntegrationTests-SPM.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "IntegrationTests-SPM.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
57-
8661386D2CC943DE00F4B78E /* IntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegrationTests.swift; sourceTree = "<group>"; };
58-
8689CDCB2D7F8BCF00BF426B /* CountTokensIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountTokensIntegrationTests.swift; sourceTree = "<group>"; };
59-
868A7C462CCA931B00E449DD /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
60-
868A7C4D2CCC1F4700E449DD /* Credentials.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = "<group>"; };
61-
868A7C502CCC263300E449DD /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
62-
868A7C532CCC26B500E449DD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
63-
868A7C552CCC271300E449DD /* TestApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = TestApp.entitlements; sourceTree = "<group>"; };
64-
8698D7472CD4332B00ABA833 /* TestAppCheckProviderFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestAppCheckProviderFactory.swift; sourceTree = "<group>"; };
65-
86CC31342D91EE9E0087E964 /* FirebaseAppUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirebaseAppUtils.swift; sourceTree = "<group>"; };
66-
86D77DFB2D7A5340003D155D /* GenerateContentIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenerateContentIntegrationTests.swift; sourceTree = "<group>"; };
67-
86D77DFD2D7B5C86003D155D /* GoogleService-Info-Spark.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info-Spark.plist"; sourceTree = "<group>"; };
68-
86D77E012D7B63AC003D155D /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
69-
86D77E032D7B6C95003D155D /* InstanceConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstanceConfig.swift; sourceTree = "<group>"; };
70-
DEF0BB4E2DA74F460093E9F4 /* TestHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestHelpers.swift; sourceTree = "<group>"; };
71-
DEF0BB502DA9B7400093E9F4 /* SchemaTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SchemaTests.swift; sourceTree = "<group>"; };
72-
DEF4634A2EA1AA77004E79B1 /* ServerPromptTemplateIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerPromptTemplateIntegrationTests.swift; sourceTree = "<group>"; };
7329
/* End PBXFileReference section */
7430

31+
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
32+
863E940D2EC69AF000BE4F4E /* Exceptions for "Resources" folder in "IntegrationTests-SPM" target */ = {
33+
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
34+
membershipExceptions = (
35+
Assets.xcassets,
36+
);
37+
target = 866138682CC943DE00F4B78E /* IntegrationTests-SPM */;
38+
};
39+
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
40+
41+
/* Begin PBXFileSystemSynchronizedRootGroup section */
42+
863E93E02EC69A9500BE4F4E /* Sources */ = {
43+
isa = PBXFileSystemSynchronizedRootGroup;
44+
path = Sources;
45+
sourceTree = "<group>";
46+
};
47+
863E93F42EC69AB100BE4F4E /* Tests */ = {
48+
isa = PBXFileSystemSynchronizedRootGroup;
49+
path = Tests;
50+
sourceTree = "<group>";
51+
};
52+
863E94072EC69AF000BE4F4E /* Resources */ = {
53+
isa = PBXFileSystemSynchronizedRootGroup;
54+
exceptions = (
55+
863E940D2EC69AF000BE4F4E /* Exceptions for "Resources" folder in "IntegrationTests-SPM" target */,
56+
);
57+
path = Resources;
58+
sourceTree = "<group>";
59+
};
60+
/* End PBXFileSystemSynchronizedRootGroup section */
61+
7562
/* Begin PBXFrameworksBuildPhase section */
7663
866138552CC943DD00F4B78E /* Frameworks */ = {
7764
isa = PBXFrameworksBuildPhase;
@@ -97,9 +84,9 @@
9784
8661384F2CC943DD00F4B78E = {
9885
isa = PBXGroup;
9986
children = (
100-
868A7C562CCC277100E449DD /* Sources */,
101-
868A7C582CCC27AF00E449DD /* Tests */,
102-
868A7C472CCA931B00E449DD /* Resources */,
87+
863E93E02EC69A9500BE4F4E /* Sources */,
88+
863E93F42EC69AB100BE4F4E /* Tests */,
89+
863E94072EC69AF000BE4F4E /* Resources */,
10390
866138592CC943DD00F4B78E /* Products */,
10491
);
10592
sourceTree = "<group>";
@@ -113,73 +100,6 @@
113100
name = Products;
114101
sourceTree = "<group>";
115102
};
116-
868A7C472CCA931B00E449DD /* Resources */ = {
117-
isa = PBXGroup;
118-
children = (
119-
868A7C512CCC263300E449DD /* Preview Content */,
120-
868A7C532CCC26B500E449DD /* Assets.xcassets */,
121-
868A7C552CCC271300E449DD /* TestApp.entitlements */,
122-
868A7C462CCA931B00E449DD /* GoogleService-Info.plist */,
123-
86D77DFD2D7B5C86003D155D /* GoogleService-Info-Spark.plist */,
124-
);
125-
path = Resources;
126-
sourceTree = "<group>";
127-
};
128-
868A7C512CCC263300E449DD /* Preview Content */ = {
129-
isa = PBXGroup;
130-
children = (
131-
868A7C502CCC263300E449DD /* Preview Assets.xcassets */,
132-
);
133-
path = "Preview Content";
134-
sourceTree = "<group>";
135-
};
136-
868A7C562CCC277100E449DD /* Sources */ = {
137-
isa = PBXGroup;
138-
children = (
139-
8661385B2CC943DD00F4B78E /* TestApp.swift */,
140-
8698D7472CD4332B00ABA833 /* TestAppCheckProviderFactory.swift */,
141-
8661385D2CC943DD00F4B78E /* ContentView.swift */,
142-
86D77E012D7B63AC003D155D /* Constants.swift */,
143-
86CC31342D91EE9E0087E964 /* FirebaseAppUtils.swift */,
144-
);
145-
path = Sources;
146-
sourceTree = "<group>";
147-
};
148-
868A7C572CCC27AF00E449DD /* Integration */ = {
149-
isa = PBXGroup;
150-
children = (
151-
DEF4634A2EA1AA77004E79B1 /* ServerPromptTemplateIntegrationTests.swift */,
152-
0E460FAA2E9858E4007E26A6 /* LiveSessionTests.swift */,
153-
DEF0BB502DA9B7400093E9F4 /* SchemaTests.swift */,
154-
DEF0BB4E2DA74F460093E9F4 /* TestHelpers.swift */,
155-
8689CDCB2D7F8BCF00BF426B /* CountTokensIntegrationTests.swift */,
156-
868A7C4D2CCC1F4700E449DD /* Credentials.swift */,
157-
8661386D2CC943DE00F4B78E /* IntegrationTests.swift */,
158-
86D77DFB2D7A5340003D155D /* GenerateContentIntegrationTests.swift */,
159-
864F8F702D4980D60002EA7E /* ImagenIntegrationTests.swift */,
160-
);
161-
path = Integration;
162-
sourceTree = "<group>";
163-
};
164-
868A7C582CCC27AF00E449DD /* Tests */ = {
165-
isa = PBXGroup;
166-
children = (
167-
868A7C572CCC27AF00E449DD /* Integration */,
168-
8698D7442CD3CEF700ABA833 /* Utilities */,
169-
);
170-
path = Tests;
171-
sourceTree = "<group>";
172-
};
173-
8698D7442CD3CEF700ABA833 /* Utilities */ = {
174-
isa = PBXGroup;
175-
children = (
176-
0E0481212EA2E51100A50172 /* DataUtils.swift */,
177-
86D77E032D7B6C95003D155D /* InstanceConfig.swift */,
178-
862218802D04E08D007ED2D4 /* IntegrationTestUtils.swift */,
179-
);
180-
path = Utilities;
181-
sourceTree = "<group>";
182-
};
183103
/* End PBXGroup section */
184104

185105
/* Begin PBXNativeTarget section */
@@ -195,6 +115,10 @@
195115
);
196116
dependencies = (
197117
);
118+
fileSystemSynchronizedGroups = (
119+
863E93E02EC69A9500BE4F4E /* Sources */,
120+
863E94072EC69AF000BE4F4E /* Resources */,
121+
);
198122
name = "FirebaseAITestApp-SPM";
199123
packageProductDependencies = (
200124
86E8505A2DBAFBC3002E8D94 /* FirebaseAI */,
@@ -219,6 +143,9 @@
219143
dependencies = (
220144
8661386B2CC943DE00F4B78E /* PBXTargetDependency */,
221145
);
146+
fileSystemSynchronizedGroups = (
147+
863E93F42EC69AB100BE4F4E /* Tests */,
148+
);
222149
name = "IntegrationTests-SPM";
223150
productName = FirebaseAITestAppTests;
224151
productReference = 866138692CC943DE00F4B78E /* IntegrationTests-SPM.xctest */;
@@ -233,6 +160,7 @@
233160
BuildIndependentTargetsInParallel = 1;
234161
LastSwiftUpdateCheck = 1520;
235162
LastUpgradeCheck = 1600;
163+
ORGANIZATIONNAME = "Google LLC";
236164
TargetAttributes = {
237165
866138572CC943DD00F4B78E = {
238166
CreatedOnToolsVersion = 15.2;
@@ -244,17 +172,18 @@
244172
};
245173
};
246174
buildConfigurationList = 866138532CC943DD00F4B78E /* Build configuration list for PBXProject "FirebaseAITestApp" */;
247-
compatibilityVersion = "Xcode 15.0";
248175
developmentRegion = en;
249176
hasScannedForEncodings = 0;
250177
knownRegions = (
251178
en,
252179
Base,
253180
);
254181
mainGroup = 8661384F2CC943DD00F4B78E;
182+
minimizedProjectReferenceProxies = 1;
255183
packageReferences = (
256184
86E850592DBAFBC3002E8D94 /* XCLocalSwiftPackageReference "../../.." */,
257185
);
186+
preferredProjectObjectVersion = 77;
258187
productRefGroup = 866138592CC943DD00F4B78E /* Products */;
259188
projectDirPath = "";
260189
projectRoot = "";
@@ -270,18 +199,13 @@
270199
isa = PBXResourcesBuildPhase;
271200
buildActionMask = 2147483647;
272201
files = (
273-
868A7C522CCC263300E449DD /* Preview Assets.xcassets in Resources */,
274-
86D77DFE2D7B5C86003D155D /* GoogleService-Info-Spark.plist in Resources */,
275-
868A7C542CCC26B500E449DD /* Assets.xcassets in Resources */,
276-
868A7C482CCA931B00E449DD /* GoogleService-Info.plist in Resources */,
277202
);
278203
runOnlyForDeploymentPostprocessing = 0;
279204
};
280205
866138672CC943DE00F4B78E /* Resources */ = {
281206
isa = PBXResourcesBuildPhase;
282207
buildActionMask = 2147483647;
283208
files = (
284-
0EC8BAE22E98784E0075A4E0 /* Assets.xcassets in Resources */,
285209
);
286210
runOnlyForDeploymentPostprocessing = 0;
287211
};
@@ -292,30 +216,13 @@
292216
isa = PBXSourcesBuildPhase;
293217
buildActionMask = 2147483647;
294218
files = (
295-
86CC31352D91EE9E0087E964 /* FirebaseAppUtils.swift in Sources */,
296-
8661385E2CC943DD00F4B78E /* ContentView.swift in Sources */,
297-
8661385C2CC943DD00F4B78E /* TestApp.swift in Sources */,
298-
8698D7482CD4332B00ABA833 /* TestAppCheckProviderFactory.swift in Sources */,
299-
86D77E022D7B63AF003D155D /* Constants.swift in Sources */,
300219
);
301220
runOnlyForDeploymentPostprocessing = 0;
302221
};
303222
866138652CC943DE00F4B78E /* Sources */ = {
304223
isa = PBXSourcesBuildPhase;
305224
buildActionMask = 2147483647;
306225
files = (
307-
8689CDCC2D7F8BD700BF426B /* CountTokensIntegrationTests.swift in Sources */,
308-
86D77E042D7B6C9D003D155D /* InstanceConfig.swift in Sources */,
309-
0E460FAB2E9858E4007E26A6 /* LiveSessionTests.swift in Sources */,
310-
DEF0BB512DA9B7450093E9F4 /* SchemaTests.swift in Sources */,
311-
DEF0BB4F2DA74F680093E9F4 /* TestHelpers.swift in Sources */,
312-
868A7C4F2CCC229F00E449DD /* Credentials.swift in Sources */,
313-
0E0481222EA2E51300A50172 /* DataUtils.swift in Sources */,
314-
864F8F712D4980DD0002EA7E /* ImagenIntegrationTests.swift in Sources */,
315-
862218812D04E098007ED2D4 /* IntegrationTestUtils.swift in Sources */,
316-
86D77DFC2D7A5340003D155D /* GenerateContentIntegrationTests.swift in Sources */,
317-
DEF4634B2EA1AA77004E79B1 /* ServerPromptTemplateIntegrationTests.swift in Sources */,
318-
8661386E2CC943DE00F4B78E /* IntegrationTests.swift in Sources */,
319226
);
320227
runOnlyForDeploymentPostprocessing = 0;
321228
};

0 commit comments

Comments
 (0)