Skip to content

Commit 402dc1b

Browse files
zakariaridouhzakariaridouh
committed
Use modern Xcode Folders for SwiftBrowser xcodeproj
https://bugs.webkit.org/show_bug.cgi?id=317620 rdar://180349185 Reviewed by Richard Robinson. Convert some Xcode Groups to modern Xcode buildable folders for some SwiftBrowser folders. * Tools/SwiftBrowser/SwiftBrowser.xcodeproj/project.pbxproj: Canonical link: https://commits.webkit.org/316531@main
1 parent b3d9e3b commit 402dc1b

1 file changed

Lines changed: 31 additions & 165 deletions

File tree

‎Tools/SwiftBrowser/SwiftBrowser.xcodeproj/project.pbxproj‎

Lines changed: 31 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,12 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 63;
6+
objectVersion = 71;
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
07259B2E2D1F308500B45C4E /* DialogPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07259B2D2D1F308500B45C4E /* DialogPresenter.swift */; };
11-
07259B362D1F969A00B45C4E /* NavigationDecider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07259B352D1F969A00B45C4E /* NavigationDecider.swift */; };
12-
07259B392D1F97A500B45C4E /* URLResponse+Extras.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07259B382D1F97A500B45C4E /* URLResponse+Extras.swift */; };
13-
078F11852D288FAC00B3582D /* URLRequest+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 078F11842D288FAC00B3582D /* URLRequest+Codable.swift */; };
14-
07A4CE9F2D08C06400764F5E /* Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A4CE9E2D08C06400764F5E /* Empty.swift */; };
1510
07A4CEC32D092C0800764F5E /* _WebKit_SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07A4CEC22D092C0800764F5E /* _WebKit_SwiftUI.framework */; };
16-
07A58BED2D04013100CAB4ED /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 07A58BE82D04013100CAB4ED /* Assets.xcassets */; };
17-
07A58BEE2D04013100CAB4ED /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A58BE92D04013100CAB4ED /* ContentView.swift */; };
18-
07A58BEF2D04013100CAB4ED /* SwiftBrowser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A58BEB2D04013100CAB4ED /* SwiftBrowser.swift */; };
19-
07A58C002D040E3400CAB4ED /* BrowserViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A58BFF2D040E3400CAB4ED /* BrowserViewModel.swift */; };
20-
07A58C022D04111900CAB4ED /* BrowserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A58C012D04111900CAB4ED /* BrowserView.swift */; };
2111
07A58C0E2D04DD4700CAB4ED /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07A58C0D2D04DD4700CAB4ED /* WebKit.framework */; };
22-
07A58C482D05651C00CAB4ED /* AppStorageKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A58C472D05651C00CAB4ED /* AppStorageKeys.swift */; };
23-
07A58C4A2D0567A100CAB4ED /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A58C492D0567A100CAB4ED /* SettingsView.swift */; };
24-
07BAE3C82E811D5600027836 /* SwiftUI+Extras.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07BAE3C72E811D5100027836 /* SwiftUI+Extras.swift */; };
25-
07BAE3CA2E811D9100027836 /* FeatureFlags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07BAE3C92E811D8A00027836 /* FeatureFlags.swift */; };
26-
07BAE3CC2E811F0C00027836 /* FeatureFlagsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07BAE3CB2E811F0600027836 /* FeatureFlagsModel.swift */; };
27-
07BAE3CE2E811F4400027836 /* _WKFeature+Extras.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07BAE3CD2E811F3D00027836 /* _WKFeature+Extras.swift */; };
28-
07E88A872E774C93005A53CB /* WebToolbarModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07E88A862E774C93005A53CB /* WebToolbarModifier.swift */; };
29-
07E88A892E777C61005A53CB /* WebContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07E88A882E777C61005A53CB /* WebContextMenu.swift */; };
30-
330FBEE22DEAD07600C266CA /* CommandLine+Extras.swift in Sources */ = {isa = PBXBuildFile; fileRef = 330FBEE12DEAD05F00C266CA /* CommandLine+Extras.swift */; };
3112
/* End PBXBuildFile section */
3213

3314
/* Begin PBXCopyFilesBuildPhase section */
@@ -44,36 +25,27 @@
4425
/* End PBXCopyFilesBuildPhase section */
4526

4627
/* Begin PBXFileReference section */
47-
07259B2D2D1F308500B45C4E /* DialogPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DialogPresenter.swift; sourceTree = "<group>"; };
48-
07259B352D1F969A00B45C4E /* NavigationDecider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationDecider.swift; sourceTree = "<group>"; };
49-
07259B382D1F97A500B45C4E /* URLResponse+Extras.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLResponse+Extras.swift"; sourceTree = "<group>"; };
50-
078F11842D288FAC00B3582D /* URLRequest+Codable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLRequest+Codable.swift"; sourceTree = "<group>"; };
51-
07A4CE9E2D08C06400764F5E /* Empty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Empty.swift; sourceTree = "<group>"; };
5228
07A4CEC22D092C0800764F5E /* _WebKit_SwiftUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = _WebKit_SwiftUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5329
07A58BD42D0400B300CAB4ED /* SwiftBrowser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftBrowser.app; sourceTree = BUILT_PRODUCTS_DIR; };
54-
07A58BE82D04013100CAB4ED /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
55-
07A58BE92D04013100CAB4ED /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
56-
07A58BEA2D04013100CAB4ED /* SwiftBrowser.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SwiftBrowser.entitlements; sourceTree = "<group>"; };
57-
07A58BEB2D04013100CAB4ED /* SwiftBrowser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftBrowser.swift; sourceTree = "<group>"; };
58-
07A58BF52D04046900CAB4ED /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
59-
07A58BF62D04056500CAB4ED /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
60-
07A58BF72D0405E200CAB4ED /* SwiftBrowser.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SwiftBrowser.xcconfig; sourceTree = "<group>"; };
61-
07A58BFA2D04065000CAB4ED /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
62-
07A58BFD2D04076700CAB4ED /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
63-
07A58BFF2D040E3400CAB4ED /* BrowserViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowserViewModel.swift; sourceTree = "<group>"; };
64-
07A58C012D04111900CAB4ED /* BrowserView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowserView.swift; sourceTree = "<group>"; };
6530
07A58C0D2D04DD4700CAB4ED /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
66-
07A58C472D05651C00CAB4ED /* AppStorageKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppStorageKeys.swift; sourceTree = "<group>"; };
67-
07A58C492D0567A100CAB4ED /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
68-
07BAE3C72E811D5100027836 /* SwiftUI+Extras.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SwiftUI+Extras.swift"; sourceTree = "<group>"; };
69-
07BAE3C92E811D8A00027836 /* FeatureFlags.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlags.swift; sourceTree = "<group>"; };
70-
07BAE3CB2E811F0600027836 /* FeatureFlagsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlagsModel.swift; sourceTree = "<group>"; };
71-
07BAE3CD2E811F3D00027836 /* _WKFeature+Extras.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "_WKFeature+Extras.swift"; sourceTree = "<group>"; };
72-
07E88A862E774C93005A53CB /* WebToolbarModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebToolbarModifier.swift; sourceTree = "<group>"; };
73-
07E88A882E777C61005A53CB /* WebContextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebContextMenu.swift; sourceTree = "<group>"; };
74-
330FBEE12DEAD05F00C266CA /* CommandLine+Extras.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CommandLine+Extras.swift"; sourceTree = "<group>"; };
7531
/* End PBXFileReference section */
7632

33+
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
34+
B975015F2FE9F5BA0067C5C8 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
35+
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
36+
membershipExceptions = (
37+
Assets.xcassets,
38+
);
39+
target = 07A58BD32D0400B300CAB4ED /* SwiftBrowser */;
40+
};
41+
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
42+
43+
/* Begin PBXFileSystemSynchronizedRootGroup section */
44+
B97501332FE9F5AD0067C5C8 /* Source */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Source; sourceTree = "<group>"; };
45+
B975015D2FE9F5B90067C5C8 /* Resources */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (B975015F2FE9F5BA0067C5C8 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Resources; sourceTree = "<group>"; };
46+
B97501632FE9F5BD0067C5C8 /* Configurations */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Configurations; sourceTree = "<group>"; };
47+
/* End PBXFileSystemSynchronizedRootGroup section */
48+
7749
/* Begin PBXFrameworksBuildPhase section */
7850
07A58BD12D0400B300CAB4ED /* Frameworks */ = {
7951
isa = PBXFrameworksBuildPhase;
@@ -87,47 +59,12 @@
8759
/* End PBXFrameworksBuildPhase section */
8860

8961
/* Begin PBXGroup section */
90-
07259B2C2D1F303300B45C4E /* ViewModel */ = {
91-
isa = PBXGroup;
92-
children = (
93-
07A58C472D05651C00CAB4ED /* AppStorageKeys.swift */,
94-
07A58BFF2D040E3400CAB4ED /* BrowserViewModel.swift */,
95-
07259B2D2D1F308500B45C4E /* DialogPresenter.swift */,
96-
07BAE3C92E811D8A00027836 /* FeatureFlags.swift */,
97-
07BAE3CB2E811F0600027836 /* FeatureFlagsModel.swift */,
98-
07259B352D1F969A00B45C4E /* NavigationDecider.swift */,
99-
);
100-
path = ViewModel;
101-
sourceTree = "<group>";
102-
};
103-
07259B302D1F30DB00B45C4E /* Views */ = {
104-
isa = PBXGroup;
105-
children = (
106-
07A58C012D04111900CAB4ED /* BrowserView.swift */,
107-
07A58BE92D04013100CAB4ED /* ContentView.swift */,
108-
07A58C492D0567A100CAB4ED /* SettingsView.swift */,
109-
);
110-
path = Views;
111-
sourceTree = "<group>";
112-
};
113-
07259B372D1F978200B45C4E /* Extensions */ = {
114-
isa = PBXGroup;
115-
children = (
116-
07BAE3CD2E811F3D00027836 /* _WKFeature+Extras.swift */,
117-
330FBEE12DEAD05F00C266CA /* CommandLine+Extras.swift */,
118-
07BAE3C72E811D5100027836 /* SwiftUI+Extras.swift */,
119-
078F11842D288FAC00B3582D /* URLRequest+Codable.swift */,
120-
07259B382D1F97A500B45C4E /* URLResponse+Extras.swift */,
121-
);
122-
path = Extensions;
123-
sourceTree = "<group>";
124-
};
12562
07A58BCB2D0400B300CAB4ED = {
12663
isa = PBXGroup;
12764
children = (
128-
07A58BF32D04029900CAB4ED /* Configurations */,
129-
07A58BF82D0405F100CAB4ED /* Resources */,
130-
07A58BF42D0402CD00CAB4ED /* Source */,
65+
B97501632FE9F5BD0067C5C8 /* Configurations */,
66+
B975015D2FE9F5B90067C5C8 /* Resources */,
67+
B97501332FE9F5AD0067C5C8 /* Source */,
13168
07A58C0C2D04DD4700CAB4ED /* Frameworks */,
13269
07A58BD52D0400B300CAB4ED /* Products */,
13370
);
@@ -141,56 +78,6 @@
14178
name = Products;
14279
sourceTree = "<group>";
14380
};
144-
07A58BF32D04029900CAB4ED /* Configurations */ = {
145-
isa = PBXGroup;
146-
children = (
147-
07A58BF52D04046900CAB4ED /* Base.xcconfig */,
148-
07A58BF62D04056500CAB4ED /* DebugRelease.xcconfig */,
149-
07A58BF72D0405E200CAB4ED /* SwiftBrowser.xcconfig */,
150-
);
151-
path = Configurations;
152-
sourceTree = "<group>";
153-
};
154-
07A58BF42D0402CD00CAB4ED /* Source */ = {
155-
isa = PBXGroup;
156-
children = (
157-
07259B372D1F978200B45C4E /* Extensions */,
158-
07E88A852E774C7E005A53CB /* Modifiers */,
159-
07259B2C2D1F303300B45C4E /* ViewModel */,
160-
07259B302D1F30DB00B45C4E /* Views */,
161-
07A4CE9E2D08C06400764F5E /* Empty.swift */,
162-
07A58BEB2D04013100CAB4ED /* SwiftBrowser.swift */,
163-
);
164-
path = Source;
165-
sourceTree = "<group>";
166-
};
167-
07A58BF82D0405F100CAB4ED /* Resources */ = {
168-
isa = PBXGroup;
169-
children = (
170-
07A58BFC2D04065A00CAB4ED /* iOS */,
171-
07A58BF92D04062900CAB4ED /* mac */,
172-
07A58BE82D04013100CAB4ED /* Assets.xcassets */,
173-
07A58BEA2D04013100CAB4ED /* SwiftBrowser.entitlements */,
174-
);
175-
path = Resources;
176-
sourceTree = "<group>";
177-
};
178-
07A58BF92D04062900CAB4ED /* mac */ = {
179-
isa = PBXGroup;
180-
children = (
181-
07A58BFA2D04065000CAB4ED /* Info.plist */,
182-
);
183-
path = mac;
184-
sourceTree = "<group>";
185-
};
186-
07A58BFC2D04065A00CAB4ED /* iOS */ = {
187-
isa = PBXGroup;
188-
children = (
189-
07A58BFD2D04076700CAB4ED /* Info.plist */,
190-
);
191-
path = iOS;
192-
sourceTree = "<group>";
193-
};
19481
07A58C0C2D04DD4700CAB4ED /* Frameworks */ = {
19582
isa = PBXGroup;
19683
children = (
@@ -200,15 +87,6 @@
20087
name = Frameworks;
20188
sourceTree = "<group>";
20289
};
203-
07E88A852E774C7E005A53CB /* Modifiers */ = {
204-
isa = PBXGroup;
205-
children = (
206-
07E88A882E777C61005A53CB /* WebContextMenu.swift */,
207-
07E88A862E774C93005A53CB /* WebToolbarModifier.swift */,
208-
);
209-
path = Modifiers;
210-
sourceTree = "<group>";
211-
};
21290
/* End PBXGroup section */
21391

21492
/* Begin PBXNativeTarget section */
@@ -225,6 +103,9 @@
225103
);
226104
dependencies = (
227105
);
106+
fileSystemSynchronizedGroups = (
107+
B97501332FE9F5AD0067C5C8 /* Source */,
108+
);
228109
name = SwiftBrowser;
229110
packageProductDependencies = (
230111
);
@@ -271,7 +152,6 @@
271152
isa = PBXResourcesBuildPhase;
272153
buildActionMask = 2147483647;
273154
files = (
274-
07A58BED2D04013100CAB4ED /* Assets.xcassets in Resources */,
275155
);
276156
runOnlyForDeploymentPostprocessing = 0;
277157
};
@@ -282,24 +162,6 @@
282162
isa = PBXSourcesBuildPhase;
283163
buildActionMask = 2147483647;
284164
files = (
285-
07BAE3CE2E811F4400027836 /* _WKFeature+Extras.swift in Sources */,
286-
07A58C482D05651C00CAB4ED /* AppStorageKeys.swift in Sources */,
287-
07A58C022D04111900CAB4ED /* BrowserView.swift in Sources */,
288-
07A58C002D040E3400CAB4ED /* BrowserViewModel.swift in Sources */,
289-
330FBEE22DEAD07600C266CA /* CommandLine+Extras.swift in Sources */,
290-
07A58BEE2D04013100CAB4ED /* ContentView.swift in Sources */,
291-
07259B2E2D1F308500B45C4E /* DialogPresenter.swift in Sources */,
292-
07A4CE9F2D08C06400764F5E /* Empty.swift in Sources */,
293-
07BAE3CA2E811D9100027836 /* FeatureFlags.swift in Sources */,
294-
07BAE3CC2E811F0C00027836 /* FeatureFlagsModel.swift in Sources */,
295-
07259B362D1F969A00B45C4E /* NavigationDecider.swift in Sources */,
296-
07A58C4A2D0567A100CAB4ED /* SettingsView.swift in Sources */,
297-
07A58BEF2D04013100CAB4ED /* SwiftBrowser.swift in Sources */,
298-
07BAE3C82E811D5600027836 /* SwiftUI+Extras.swift in Sources */,
299-
078F11852D288FAC00B3582D /* URLRequest+Codable.swift in Sources */,
300-
07259B392D1F97A500B45C4E /* URLResponse+Extras.swift in Sources */,
301-
07E88A892E777C61005A53CB /* WebContextMenu.swift in Sources */,
302-
07E88A872E774C93005A53CB /* WebToolbarModifier.swift in Sources */,
303165
);
304166
runOnlyForDeploymentPostprocessing = 0;
305167
};
@@ -308,28 +170,32 @@
308170
/* Begin XCBuildConfiguration section */
309171
07A58BE12D0400B400CAB4ED /* Debug */ = {
310172
isa = XCBuildConfiguration;
311-
baseConfigurationReference = 07A58BF62D04056500CAB4ED /* DebugRelease.xcconfig */;
173+
baseConfigurationReferenceAnchor = B97501632FE9F5BD0067C5C8 /* Configurations */;
174+
baseConfigurationReferenceRelativePath = DebugRelease.xcconfig;
312175
buildSettings = {
313176
};
314177
name = Debug;
315178
};
316179
07A58BE22D0400B400CAB4ED /* Release */ = {
317180
isa = XCBuildConfiguration;
318-
baseConfigurationReference = 07A58BF62D04056500CAB4ED /* DebugRelease.xcconfig */;
181+
baseConfigurationReferenceAnchor = B97501632FE9F5BD0067C5C8 /* Configurations */;
182+
baseConfigurationReferenceRelativePath = DebugRelease.xcconfig;
319183
buildSettings = {
320184
};
321185
name = Release;
322186
};
323187
07A58BE42D0400B400CAB4ED /* Debug */ = {
324188
isa = XCBuildConfiguration;
325-
baseConfigurationReference = 07A58BF72D0405E200CAB4ED /* SwiftBrowser.xcconfig */;
189+
baseConfigurationReferenceAnchor = B97501632FE9F5BD0067C5C8 /* Configurations */;
190+
baseConfigurationReferenceRelativePath = SwiftBrowser.xcconfig;
326191
buildSettings = {
327192
};
328193
name = Debug;
329194
};
330195
07A58BE52D0400B400CAB4ED /* Release */ = {
331196
isa = XCBuildConfiguration;
332-
baseConfigurationReference = 07A58BF72D0405E200CAB4ED /* SwiftBrowser.xcconfig */;
197+
baseConfigurationReferenceAnchor = B97501632FE9F5BD0067C5C8 /* Configurations */;
198+
baseConfigurationReferenceRelativePath = SwiftBrowser.xcconfig;
333199
buildSettings = {
334200
};
335201
name = Release;

0 commit comments

Comments
 (0)