Skip to content

Commit 0da9ee6

Browse files
swisspolswisspol
authored
Merge pull request swisspol#497 from trapper-/master
Replace deprecated MobileCoreServices with CoreServices
2 parents 1c36bf0 + 6c93927 commit 0da9ee6

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎GCDWebServer.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ Pod::Spec.new do |s|
2626
cs.private_header_files = "GCDWebServer/Core/GCDWebServerPrivate.h"
2727
cs.requires_arc = true
2828
cs.ios.library = 'z'
29-
cs.ios.frameworks = 'MobileCoreServices', 'CFNetwork'
29+
cs.ios.frameworks = 'CoreServices', 'CFNetwork'
3030
cs.tvos.library = 'z'
31-
cs.tvos.frameworks = 'MobileCoreServices', 'CFNetwork'
31+
cs.tvos.frameworks = 'CoreServices', 'CFNetwork'
3232
cs.osx.library = 'z'
3333
cs.osx.framework = 'SystemConfiguration'
3434
end

‎GCDWebServer.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
CEE28D501AE0098600F4023C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2BE851018E79DAF0061360B /* SystemConfiguration.framework */; };
9797
CEE28D511AE0098C00F4023C /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E208D1B2167BB17E00500836 /* CoreServices.framework */; };
9898
CEE28D521AE00A7A00F4023C /* GCDWebServers.h in Headers */ = {isa = PBXBuildFile; fileRef = CEE28CF31AE0051F00F4023C /* GCDWebServers.h */; settings = {ATTRIBUTES = (Public, ); }; };
99-
CEE28D571AE00AFE00F4023C /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E221129C1690B7BA0048D2B2 /* MobileCoreServices.framework */; };
99+
CEE28D571AE00AFE00F4023C /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E221129C1690B7BA0048D2B2 /* CoreServices.framework */; };
100100
CEE28D591AE00AFE00F4023C /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E22112981690B7AA0048D2B2 /* CFNetwork.framework */; };
101101
CEE28D6A1AE1ABAA00F4023C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEE28D691AE1ABAA00F4023C /* UIKit.framework */; };
102102
E208D149167B76B700500836 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E208D148167B76B700500836 /* CFNetwork.framework */; };
@@ -161,7 +161,7 @@
161161
E2DDD1B71BE6951A002CE867 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD1B61BE6951A002CE867 /* CFNetwork.framework */; };
162162
E2DDD1BA1BE69545002CE867 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD1B91BE69545002CE867 /* libz.tbd */; };
163163
E2DDD1BC1BE69551002CE867 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD1BB1BE69551002CE867 /* libxml2.tbd */; };
164-
E2DDD1BE1BE6956F002CE867 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD1BD1BE6956F002CE867 /* MobileCoreServices.framework */; };
164+
E2DDD1BE1BE6956F002CE867 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD1BD1BE6956F002CE867 /* CoreServices.framework */; };
165165
E2DDD1C01BE69576002CE867 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD1BF1BE69576002CE867 /* UIKit.framework */; };
166166
E2DDD1CE1BE698A8002CE867 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2DDD1CD1BE698A8002CE867 /* AppDelegate.swift */; };
167167
E2DDD1D11BE698A8002CE867 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2DDD1D01BE698A8002CE867 /* ViewController.swift */; };
@@ -293,7 +293,7 @@
293293
E208D1B2167BB17E00500836 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
294294
E221128E1690B6470048D2B2 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
295295
E22112981690B7AA0048D2B2 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.0.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; };
296-
E221129C1690B7BA0048D2B2 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.0.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; };
296+
E221129C1690B7BA0048D2B2 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.0.sdk/System/Library/Frameworks/CoreServices.framework; sourceTree = DEVELOPER_DIR; };
297297
E24039251BA09207000B7089 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
298298
E24039311BA092B7000B7089 /* Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; };
299299
E24A3C4021E2940600C58878 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
@@ -335,7 +335,7 @@
335335
E2DDD1B61BE6951A002CE867 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; };
336336
E2DDD1B91BE69545002CE867 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
337337
E2DDD1BB1BE69551002CE867 /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/usr/lib/libxml2.tbd; sourceTree = DEVELOPER_DIR; };
338-
E2DDD1BD1BE6956F002CE867 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; };
338+
E2DDD1BD1BE6956F002CE867 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/System/Library/Frameworks/CoreServices.framework; sourceTree = DEVELOPER_DIR; };
339339
E2DDD1BF1BE69576002CE867 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
340340
E2DDD1C71BE698A8002CE867 /* GCDWebServer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GCDWebServer.app; sourceTree = BUILT_PRODUCTS_DIR; };
341341
E2DDD1CD1BE698A8002CE867 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -387,7 +387,7 @@
387387
buildActionMask = 2147483647;
388388
files = (
389389
CEE28D6A1AE1ABAA00F4023C /* UIKit.framework in Frameworks */,
390-
CEE28D571AE00AFE00F4023C /* MobileCoreServices.framework in Frameworks */,
390+
CEE28D571AE00AFE00F4023C /* CoreServices.framework in Frameworks */,
391391
CEE28D591AE00AFE00F4023C /* CFNetwork.framework in Frameworks */,
392392
E2DDD2251BE6A0AE002CE867 /* libxml2.tbd in Frameworks */,
393393
E2DDD2271BE6A0B4002CE867 /* libz.tbd in Frameworks */,
@@ -407,7 +407,7 @@
407407
buildActionMask = 2147483647;
408408
files = (
409409
E2DDD1C01BE69576002CE867 /* UIKit.framework in Frameworks */,
410-
E2DDD1BE1BE6956F002CE867 /* MobileCoreServices.framework in Frameworks */,
410+
E2DDD1BE1BE6956F002CE867 /* CoreServices.framework in Frameworks */,
411411
E2DDD1B71BE6951A002CE867 /* CFNetwork.framework in Frameworks */,
412412
E2DDD1BC1BE69551002CE867 /* libxml2.tbd in Frameworks */,
413413
E2DDD1BA1BE69545002CE867 /* libz.tbd in Frameworks */,
@@ -490,7 +490,7 @@
490490
isa = PBXGroup;
491491
children = (
492492
CEE28D691AE1ABAA00F4023C /* UIKit.framework */,
493-
E221129C1690B7BA0048D2B2 /* MobileCoreServices.framework */,
493+
E221129C1690B7BA0048D2B2 /* CoreServices.framework */,
494494
E22112981690B7AA0048D2B2 /* CFNetwork.framework */,
495495
E2DDD2241BE6A0AE002CE867 /* libxml2.tbd */,
496496
E2DDD2261BE6A0B4002CE867 /* libz.tbd */,
@@ -593,7 +593,7 @@
593593
isa = PBXGroup;
594594
children = (
595595
E2DDD1BF1BE69576002CE867 /* UIKit.framework */,
596-
E2DDD1BD1BE6956F002CE867 /* MobileCoreServices.framework */,
596+
E2DDD1BD1BE6956F002CE867 /* CoreServices.framework */,
597597
E2DDD1B61BE6951A002CE867 /* CFNetwork.framework */,
598598
E2DDD1BB1BE69551002CE867 /* libxml2.tbd */,
599599
E2DDD1B91BE69545002CE867 /* libz.tbd */,

‎GCDWebServer/Core/GCDWebServerFunctions.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#import <TargetConditionals.h>
3333
#if TARGET_OS_IPHONE
34-
#import <MobileCoreServices/MobileCoreServices.h>
34+
#import <CoreServices/CoreServices.h>
3535
#else
3636
#import <SystemConfiguration/SystemConfiguration.h>
3737
#endif

0 commit comments

Comments
 (0)