Skip to content

Commit e561389

Browse files
swisspolswisspol
committed
Use explicit modulemap for frameworks
1 parent 32cf20a commit e561389

3 files changed

Lines changed: 23 additions & 16 deletions

File tree

‎Frameworks/GCDWebServers.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,27 @@
2626
*/
2727

2828
// GCDWebServer Core
29-
#import <GCDWebServers/GCDWebServer.h>
30-
#import <GCDWebServers/GCDWebServerConnection.h>
31-
#import <GCDWebServers/GCDWebServerFunctions.h>
32-
#import <GCDWebServers/GCDWebServerHTTPStatusCodes.h>
33-
#import <GCDWebServers/GCDWebServerResponse.h>
34-
#import <GCDWebServers/GCDWebServerRequest.h>
29+
#import "GCDWebServer.h"
30+
#import "GCDWebServerConnection.h"
31+
#import "GCDWebServerFunctions.h"
32+
#import "GCDWebServerHTTPStatusCodes.h"
33+
#import "GCDWebServerResponse.h"
34+
#import "GCDWebServerRequest.h"
3535

3636
// GCDWebServer Requests
37-
#import <GCDWebServers/GCDWebServerDataRequest.h>
38-
#import <GCDWebServers/GCDWebServerFileRequest.h>
39-
#import <GCDWebServers/GCDWebServerMultiPartFormRequest.h>
40-
#import <GCDWebServers/GCDWebServerURLEncodedFormRequest.h>
37+
#import "GCDWebServerDataRequest.h"
38+
#import "GCDWebServerFileRequest.h"
39+
#import "GCDWebServerMultiPartFormRequest.h"
40+
#import "GCDWebServerURLEncodedFormRequest.h"
4141

4242
// GCDWebServer Responses
43-
#import <GCDWebServers/GCDWebServerDataResponse.h>
44-
#import <GCDWebServers/GCDWebServerErrorResponse.h>
45-
#import <GCDWebServers/GCDWebServerFileResponse.h>
46-
#import <GCDWebServers/GCDWebServerStreamedResponse.h>
43+
#import "GCDWebServerDataResponse.h"
44+
#import "GCDWebServerErrorResponse.h"
45+
#import "GCDWebServerFileResponse.h"
46+
#import "GCDWebServerStreamedResponse.h"
4747

4848
// GCDWebUploader
49-
#import <GCDWebServers/GCDWebUploader.h>
49+
#import "GCDWebUploader.h"
5050

5151
// GCDWebDAVServer
52-
#import <GCDWebServers/GCDWebDAVServer.h>
52+
#import "GCDWebDAVServer.h"

‎Frameworks/module.modulemap‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
framework module GCDWebServers {
2+
umbrella header "GCDWebServers.h"
3+
}

‎GCDWebServer.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@
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
E24A3BE021E2795700C58878 /* BridgingHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BridgingHeader.h; sourceTree = SOURCE_ROOT; };
300+
E24A3C4021E2940600C58878 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
300301
E28BAE1618F99C810095C089 /* GCDWebServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServer.h; sourceTree = "<group>"; };
301302
E28BAE1718F99C810095C089 /* GCDWebServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServer.m; sourceTree = "<group>"; };
302303
E28BAE1818F99C810095C089 /* GCDWebServerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerConnection.h; sourceTree = "<group>"; };
@@ -471,6 +472,7 @@
471472
CEE28D081AE0053E00F4023C /* Frameworks */ = {
472473
isa = PBXGroup;
473474
children = (
475+
E24A3C4021E2940600C58878 /* module.modulemap */,
474476
CEE28CF31AE0051F00F4023C /* GCDWebServers.h */,
475477
CEE28CF21AE0051F00F4023C /* Info.plist */,
476478
E24039311BA092B7000B7089 /* Tests.m */,
@@ -1268,6 +1270,7 @@
12681270
INFOPLIST_FILE = Frameworks/Info.plist;
12691271
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
12701272
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1273+
MODULEMAP_FILE = Frameworks/module.modulemap;
12711274
PRODUCT_NAME = GCDWebServers;
12721275
SDKROOT = iphoneos;
12731276
SKIP_INSTALL = YES;
@@ -1285,6 +1288,7 @@
12851288
INFOPLIST_FILE = Frameworks/Info.plist;
12861289
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
12871290
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1291+
MODULEMAP_FILE = Frameworks/module.modulemap;
12881292
PRODUCT_NAME = GCDWebServers;
12891293
SDKROOT = iphoneos;
12901294
SKIP_INSTALL = YES;

0 commit comments

Comments
 (0)