Skip to content

Commit 3ec154d

Browse files
mickael-menumickael-menu
committed
Fix build with Xcode 14 (#8)
1 parent 8405fd0 commit 3ec154d

File tree

4 files changed

+4
-229
lines changed

4 files changed

+4
-229
lines changed

‎GCDWebServer.podspec

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Pod::Spec.new do |s|
99
s.name = 'GCDWebServer'
10-
s.version = '3.7.2'
10+
s.version = '3.7.3'
1111
s.author = { 'Pierre-Olivier Latour' => '[email protected]' }
1212
s.license = { :type => 'BSD', :file => 'LICENSE' }
1313
s.homepage = 'https://github.com/readium/GCDWebServer'
@@ -21,6 +21,7 @@ Pod::Spec.new do |s|
2121

2222
s.subspec 'Core' do |cs|
2323
cs.source_files = 'GCDWebServer/**/*.{h,m}'
24+
cs.exclude_files = 'GCDWebServer/include/*'
2425
cs.requires_arc = true
2526
cs.ios.library = 'z'
2627
cs.ios.frameworks = 'MobileCoreServices', 'CFNetwork'

‎GCDWebServer.xcodeproj/project.pbxproj

-130
Original file line numberDiff line numberDiff line change
@@ -43,41 +43,10 @@
4343
CEE28D4A1AE0079200F4023C /* GCDWebUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = E2BE850918E77ECA0061360B /* GCDWebUploader.m */; };
4444
CEE28D591AE00AFE00F4023C /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E22112981690B7AA0048D2B2 /* CFNetwork.framework */; };
4545
CEE28D6A1AE1ABAA00F4023C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEE28D691AE1ABAA00F4023C /* UIKit.framework */; };
46-
E24A3C0721E2879F00C58878 /* GCDWebServer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEE28CEF1AE0051F00F4023C /* GCDWebServer.framework */; };
47-
E24A3C0E21E28D3C00C58878 /* GCDWebServer.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CEE28CEF1AE0051F00F4023C /* GCDWebServer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
48-
E2DDD1FD1BE69EE5002CE867 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2DDD1FC1BE69EE5002CE867 /* AppDelegate.swift */; };
49-
E2DDD2001BE69EE5002CE867 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2DDD1FF1BE69EE5002CE867 /* ViewController.swift */; };
50-
E2DDD2031BE69EE5002CE867 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E2DDD2011BE69EE5002CE867 /* Main.storyboard */; };
51-
E2DDD2051BE69EE5002CE867 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2DDD2041BE69EE5002CE867 /* Assets.xcassets */; };
52-
E2DDD2081BE69EE5002CE867 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E2DDD2061BE69EE5002CE867 /* LaunchScreen.storyboard */; };
5346
E2DDD2251BE6A0AE002CE867 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD2241BE6A0AE002CE867 /* libxml2.tbd */; };
5447
E2DDD2271BE6A0B4002CE867 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD2261BE6A0B4002CE867 /* libz.tbd */; };
5548
/* End PBXBuildFile section */
5649

57-
/* Begin PBXContainerItemProxy section */
58-
E24A3C0321E2879000C58878 /* PBXContainerItemProxy */ = {
59-
isa = PBXContainerItemProxy;
60-
containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
61-
proxyType = 1;
62-
remoteGlobalIDString = CEE28CEE1AE0051F00F4023C;
63-
remoteInfo = "GCDWebServers (iOS)";
64-
};
65-
/* End PBXContainerItemProxy section */
66-
67-
/* Begin PBXCopyFilesBuildPhase section */
68-
E24A3C0C21E28D1E00C58878 /* Copy Frameworks */ = {
69-
isa = PBXCopyFilesBuildPhase;
70-
buildActionMask = 2147483647;
71-
dstPath = "";
72-
dstSubfolderSpec = 10;
73-
files = (
74-
E24A3C0E21E28D3C00C58878 /* GCDWebServer.framework in Copy Frameworks */,
75-
);
76-
name = "Copy Frameworks";
77-
runOnlyForDeploymentPostprocessing = 0;
78-
};
79-
/* End PBXCopyFilesBuildPhase section */
80-
8150
/* Begin PBXFileReference section */
8251
CA91838328B8E10100ACD424 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
8352
CEE28CEF1AE0051F00F4023C /* GCDWebServer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GCDWebServer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -121,7 +90,6 @@
12190
E2BE850718E77ECA0061360B /* GCDWebUploader.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = GCDWebUploader.bundle; sourceTree = "<group>"; };
12291
E2BE850818E77ECA0061360B /* GCDWebUploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebUploader.h; sourceTree = "<group>"; };
12392
E2BE850918E77ECA0061360B /* GCDWebUploader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebUploader.m; sourceTree = "<group>"; };
124-
E2DDD1F61BE69EE4002CE867 /* GCDWebServer Sample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "GCDWebServer Sample.app"; sourceTree = BUILT_PRODUCTS_DIR; };
12593
E2DDD1FC1BE69EE5002CE867 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
12694
E2DDD1FF1BE69EE5002CE867 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
12795
E2DDD2021BE69EE5002CE867 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -145,14 +113,6 @@
145113
);
146114
runOnlyForDeploymentPostprocessing = 0;
147115
};
148-
E2DDD1F31BE69EE4002CE867 /* Frameworks */ = {
149-
isa = PBXFrameworksBuildPhase;
150-
buildActionMask = 2147483647;
151-
files = (
152-
E24A3C0721E2879F00C58878 /* GCDWebServer.framework in Frameworks */,
153-
);
154-
runOnlyForDeploymentPostprocessing = 0;
155-
};
156116
/* End PBXFrameworksBuildPhase section */
157117

158118
/* Begin PBXGroup section */
@@ -176,7 +136,6 @@
176136
isa = PBXGroup;
177137
children = (
178138
CEE28CEF1AE0051F00F4023C /* GCDWebServer.framework */,
179-
E2DDD1F61BE69EE4002CE867 /* GCDWebServer Sample.app */,
180139
);
181140
name = Products;
182141
sourceTree = "<group>";
@@ -344,25 +303,6 @@
344303
productReference = CEE28CEF1AE0051F00F4023C /* GCDWebServer.framework */;
345304
productType = "com.apple.product-type.framework";
346305
};
347-
E2DDD1F51BE69EE4002CE867 /* GCDWebServer Sample (iOS) */ = {
348-
isa = PBXNativeTarget;
349-
buildConfigurationList = E2DDD20A1BE69EE5002CE867 /* Build configuration list for PBXNativeTarget "GCDWebServer Sample (iOS)" */;
350-
buildPhases = (
351-
E2DDD1F41BE69EE4002CE867 /* Resources */,
352-
E24A3C0C21E28D1E00C58878 /* Copy Frameworks */,
353-
E2DDD1F21BE69EE4002CE867 /* Sources */,
354-
E2DDD1F31BE69EE4002CE867 /* Frameworks */,
355-
);
356-
buildRules = (
357-
);
358-
dependencies = (
359-
E24A3C0421E2879000C58878 /* PBXTargetDependency */,
360-
);
361-
name = "GCDWebServer Sample (iOS)";
362-
productName = "GCDWebServer (iOS)";
363-
productReference = E2DDD1F61BE69EE4002CE867 /* GCDWebServer Sample.app */;
364-
productType = "com.apple.product-type.application";
365-
};
366306
/* End PBXNativeTarget section */
367307

368308
/* Begin PBXProject section */
@@ -374,9 +314,6 @@
374314
CEE28CEE1AE0051F00F4023C = {
375315
CreatedOnToolsVersion = 6.3;
376316
};
377-
E2DDD1F51BE69EE4002CE867 = {
378-
CreatedOnToolsVersion = 7.1;
379-
};
380317
};
381318
};
382319
buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "GCDWebServer" */;
@@ -391,7 +328,6 @@
391328
projectDirPath = "";
392329
projectRoot = "";
393330
targets = (
394-
E2DDD1F51BE69EE4002CE867 /* GCDWebServer Sample (iOS) */,
395331
CEE28CEE1AE0051F00F4023C /* GCDWebServer (iOS) */,
396332
);
397333
};
@@ -406,16 +342,6 @@
406342
);
407343
runOnlyForDeploymentPostprocessing = 0;
408344
};
409-
E2DDD1F41BE69EE4002CE867 /* Resources */ = {
410-
isa = PBXResourcesBuildPhase;
411-
buildActionMask = 2147483647;
412-
files = (
413-
E2DDD2081BE69EE5002CE867 /* LaunchScreen.storyboard in Resources */,
414-
E2DDD2051BE69EE5002CE867 /* Assets.xcassets in Resources */,
415-
E2DDD2031BE69EE5002CE867 /* Main.storyboard in Resources */,
416-
);
417-
runOnlyForDeploymentPostprocessing = 0;
418-
};
419345
/* End PBXResourcesBuildPhase section */
420346

421347
/* Begin PBXSourcesBuildPhase section */
@@ -441,25 +367,8 @@
441367
);
442368
runOnlyForDeploymentPostprocessing = 0;
443369
};
444-
E2DDD1F21BE69EE4002CE867 /* Sources */ = {
445-
isa = PBXSourcesBuildPhase;
446-
buildActionMask = 2147483647;
447-
files = (
448-
E2DDD2001BE69EE5002CE867 /* ViewController.swift in Sources */,
449-
E2DDD1FD1BE69EE5002CE867 /* AppDelegate.swift in Sources */,
450-
);
451-
runOnlyForDeploymentPostprocessing = 0;
452-
};
453370
/* End PBXSourcesBuildPhase section */
454371

455-
/* Begin PBXTargetDependency section */
456-
E24A3C0421E2879000C58878 /* PBXTargetDependency */ = {
457-
isa = PBXTargetDependency;
458-
target = CEE28CEE1AE0051F00F4023C /* GCDWebServer (iOS) */;
459-
targetProxy = E24A3C0321E2879000C58878 /* PBXContainerItemProxy */;
460-
};
461-
/* End PBXTargetDependency section */
462-
463372
/* Begin PBXVariantGroup section */
464373
E2DDD2011BE69EE5002CE867 /* Main.storyboard */ = {
465374
isa = PBXVariantGroup;
@@ -628,36 +537,6 @@
628537
};
629538
name = Release;
630539
};
631-
E2DDD20B1BE69EE5002CE867 /* Debug */ = {
632-
isa = XCBuildConfiguration;
633-
buildSettings = {
634-
COPY_PHASE_STRIP = NO;
635-
ENABLE_BITCODE = YES;
636-
INFOPLIST_FILE = iOS/Info.plist;
637-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
638-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
639-
PRODUCT_BUNDLE_IDENTIFIER = "net.pol-online.GCDWebServer.Sample";
640-
PRODUCT_NAME = "GCDWebServer Sample";
641-
SDKROOT = iphoneos;
642-
TARGETED_DEVICE_FAMILY = "1,2";
643-
};
644-
name = Debug;
645-
};
646-
E2DDD20C1BE69EE5002CE867 /* Release */ = {
647-
isa = XCBuildConfiguration;
648-
buildSettings = {
649-
COPY_PHASE_STRIP = NO;
650-
ENABLE_BITCODE = YES;
651-
INFOPLIST_FILE = iOS/Info.plist;
652-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
653-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
654-
PRODUCT_BUNDLE_IDENTIFIER = "net.pol-online.GCDWebServer.Sample";
655-
PRODUCT_NAME = "GCDWebServer Sample";
656-
SDKROOT = iphoneos;
657-
TARGETED_DEVICE_FAMILY = "1,2";
658-
};
659-
name = Release;
660-
};
661540
/* End XCBuildConfiguration section */
662541

663542
/* Begin XCConfigurationList section */
@@ -679,15 +558,6 @@
679558
defaultConfigurationIsVisible = 0;
680559
defaultConfigurationName = Release;
681560
};
682-
E2DDD20A1BE69EE5002CE867 /* Build configuration list for PBXNativeTarget "GCDWebServer Sample (iOS)" */ = {
683-
isa = XCConfigurationList;
684-
buildConfigurations = (
685-
E2DDD20B1BE69EE5002CE867 /* Debug */,
686-
E2DDD20C1BE69EE5002CE867 /* Release */,
687-
);
688-
defaultConfigurationIsVisible = 0;
689-
defaultConfigurationName = Release;
690-
};
691561
/* End XCConfigurationList section */
692562
};
693563
rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;

‎GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServer (iOS).xcscheme

+2-20
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1340"
3+
LastUpgradeVersion = "1400"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
99
<BuildActionEntry
10-
buildForTesting = "NO"
10+
buildForTesting = "YES"
1111
buildForRunning = "YES"
1212
buildForProfiling = "YES"
1313
buildForArchiving = "YES"
@@ -27,15 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<MacroExpansion>
31-
<BuildableReference
32-
BuildableIdentifier = "primary"
33-
BlueprintIdentifier = "CEE28CEE1AE0051F00F4023C"
34-
BuildableName = "GCDWebServer.framework"
35-
BlueprintName = "GCDWebServer (iOS)"
36-
ReferencedContainer = "container:GCDWebServer.xcodeproj">
37-
</BuildableReference>
38-
</MacroExpansion>
3930
<Testables>
4031
</Testables>
4132
</TestAction>
@@ -49,15 +40,6 @@
4940
debugDocumentVersioning = "YES"
5041
debugServiceExtension = "internal"
5142
allowLocationSimulation = "YES">
52-
<MacroExpansion>
53-
<BuildableReference
54-
BuildableIdentifier = "primary"
55-
BlueprintIdentifier = "CEE28CEE1AE0051F00F4023C"
56-
BuildableName = "GCDWebServer.framework"
57-
BlueprintName = "GCDWebServer (iOS)"
58-
ReferencedContainer = "container:GCDWebServer.xcodeproj">
59-
</BuildableReference>
60-
</MacroExpansion>
6143
</LaunchAction>
6244
<ProfileAction
6345
buildConfiguration = "Release"

‎GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServer Sample (iOS).xcscheme

-78
This file was deleted.

0 commit comments

Comments
 (0)