Use explicit modulemap for frameworks

This commit is contained in:
Pierre-Olivier Latour 2019-01-06 11:58:43 -08:00
parent 32cf20a1d8
commit e561389d33
3 changed files with 23 additions and 16 deletions

View File

@ -26,27 +26,27 @@
*/ */
// GCDWebServer Core // GCDWebServer Core
#import <GCDWebServers/GCDWebServer.h> #import "GCDWebServer.h"
#import <GCDWebServers/GCDWebServerConnection.h> #import "GCDWebServerConnection.h"
#import <GCDWebServers/GCDWebServerFunctions.h> #import "GCDWebServerFunctions.h"
#import <GCDWebServers/GCDWebServerHTTPStatusCodes.h> #import "GCDWebServerHTTPStatusCodes.h"
#import <GCDWebServers/GCDWebServerResponse.h> #import "GCDWebServerResponse.h"
#import <GCDWebServers/GCDWebServerRequest.h> #import "GCDWebServerRequest.h"
// GCDWebServer Requests // GCDWebServer Requests
#import <GCDWebServers/GCDWebServerDataRequest.h> #import "GCDWebServerDataRequest.h"
#import <GCDWebServers/GCDWebServerFileRequest.h> #import "GCDWebServerFileRequest.h"
#import <GCDWebServers/GCDWebServerMultiPartFormRequest.h> #import "GCDWebServerMultiPartFormRequest.h"
#import <GCDWebServers/GCDWebServerURLEncodedFormRequest.h> #import "GCDWebServerURLEncodedFormRequest.h"
// GCDWebServer Responses // GCDWebServer Responses
#import <GCDWebServers/GCDWebServerDataResponse.h> #import "GCDWebServerDataResponse.h"
#import <GCDWebServers/GCDWebServerErrorResponse.h> #import "GCDWebServerErrorResponse.h"
#import <GCDWebServers/GCDWebServerFileResponse.h> #import "GCDWebServerFileResponse.h"
#import <GCDWebServers/GCDWebServerStreamedResponse.h> #import "GCDWebServerStreamedResponse.h"
// GCDWebUploader // GCDWebUploader
#import <GCDWebServers/GCDWebUploader.h> #import "GCDWebUploader.h"
// GCDWebDAVServer // GCDWebDAVServer
#import <GCDWebServers/GCDWebDAVServer.h> #import "GCDWebDAVServer.h"

View File

@ -0,0 +1,3 @@
framework module GCDWebServers {
umbrella header "GCDWebServers.h"
}

View File

@ -297,6 +297,7 @@
E24039251BA09207000B7089 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; E24039251BA09207000B7089 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
E24039311BA092B7000B7089 /* Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; }; E24039311BA092B7000B7089 /* Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; };
E24A3BE021E2795700C58878 /* BridgingHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BridgingHeader.h; sourceTree = SOURCE_ROOT; }; E24A3BE021E2795700C58878 /* BridgingHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BridgingHeader.h; sourceTree = SOURCE_ROOT; };
E24A3C4021E2940600C58878 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
E28BAE1618F99C810095C089 /* GCDWebServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServer.h; sourceTree = "<group>"; }; E28BAE1618F99C810095C089 /* GCDWebServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServer.h; sourceTree = "<group>"; };
E28BAE1718F99C810095C089 /* GCDWebServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServer.m; sourceTree = "<group>"; }; E28BAE1718F99C810095C089 /* GCDWebServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServer.m; sourceTree = "<group>"; };
E28BAE1818F99C810095C089 /* GCDWebServerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerConnection.h; sourceTree = "<group>"; }; E28BAE1818F99C810095C089 /* GCDWebServerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerConnection.h; sourceTree = "<group>"; };
@ -471,6 +472,7 @@
CEE28D081AE0053E00F4023C /* Frameworks */ = { CEE28D081AE0053E00F4023C /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
E24A3C4021E2940600C58878 /* module.modulemap */,
CEE28CF31AE0051F00F4023C /* GCDWebServers.h */, CEE28CF31AE0051F00F4023C /* GCDWebServers.h */,
CEE28CF21AE0051F00F4023C /* Info.plist */, CEE28CF21AE0051F00F4023C /* Info.plist */,
E24039311BA092B7000B7089 /* Tests.m */, E24039311BA092B7000B7089 /* Tests.m */,
@ -1268,6 +1270,7 @@
INFOPLIST_FILE = Frameworks/Info.plist; INFOPLIST_FILE = Frameworks/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = Frameworks/module.modulemap;
PRODUCT_NAME = GCDWebServers; PRODUCT_NAME = GCDWebServers;
SDKROOT = iphoneos; SDKROOT = iphoneos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
@ -1285,6 +1288,7 @@
INFOPLIST_FILE = Frameworks/Info.plist; INFOPLIST_FILE = Frameworks/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = Frameworks/module.modulemap;
PRODUCT_NAME = GCDWebServers; PRODUCT_NAME = GCDWebServers;
SDKROOT = iphoneos; SDKROOT = iphoneos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;