Private
Public Access
1
0

Project cleanup around new submodule

This commit is contained in:
2018-11-16 01:40:02 -08:00
parent 182e240291
commit 1b12faddf8
6 changed files with 7 additions and 17 deletions

View File

@@ -10,7 +10,6 @@
1AA43E8F219EBB2D00EDF1A7 /* MBIMJSONDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AA43E8E219EBB2D00EDF1A7 /* MBIMJSONDataResponse.m */; };
1AA43E91219EBC2C00EDF1A7 /* MBIMHTTPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ACFCFE3219EB45300E2C237 /* MBIMHTTPConnection.m */; };
1AA43E95219EC38E00EDF1A7 /* MBIMHTTPUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AA43E94219EC38E00EDF1A7 /* MBIMHTTPUtilities.m */; };
1ACFCF26219EB2AC00E2C237 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1ACFCDFB219EB2AB00E2C237 /* Info.plist */; };
1ACFCF27219EB2AC00E2C237 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 1ACFCDFC219EB2AB00E2C237 /* LICENSE.txt */; };
1ACFCF29219EB2AC00E2C237 /* README.markdown in Resources */ = {isa = PBXBuildFile; fileRef = 1ACFCDFE219EB2AB00E2C237 /* README.markdown */; };
1ACFCF2A219EB2AC00E2C237 /* HTTPConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACFCE00219EB2AB00E2C237 /* HTTPConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -69,7 +68,6 @@
1ACFCFDB219EB2AC00E2C237 /* About.txt in Resources */ = {isa = PBXBuildFile; fileRef = 1ACFCF1C219EB2AC00E2C237 /* About.txt */; };
1ACFCFDC219EB2AC00E2C237 /* GCDAsyncSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACFCF1D219EB2AC00E2C237 /* GCDAsyncSocket.h */; settings = {ATTRIBUTES = (Public, ); }; };
1ACFCFDF219EB31400E2C237 /* CocoaHTTPServer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ACFCDE2219EB28A00E2C237 /* CocoaHTTPServer.framework */; };
1ACFCFE1219EB37000E2C237 /* CocoaHTTPServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACFCFE0219EB37000E2C237 /* CocoaHTTPServer.h */; settings = {ATTRIBUTES = (Public, ); }; };
CD14F18E219E2DB400E7DD22 /* CryptoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CD14F18D219E2DB400E7DD22 /* CryptoTests.m */; };
CD602056219B5DFD0024D9C5 /* MBIMBridgeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = CD602055219B5DFD0024D9C5 /* MBIMBridgeOperation.m */; };
CD60205C219B623F0024D9C5 /* MBIMMessagesListOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = CD60205B219B623F0024D9C5 /* MBIMMessagesListOperation.m */; };
@@ -133,8 +131,6 @@
1AA43E93219EC38E00EDF1A7 /* MBIMHTTPUtilities.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBIMHTTPUtilities.h; sourceTree = "<group>"; };
1AA43E94219EC38E00EDF1A7 /* MBIMHTTPUtilities.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MBIMHTTPUtilities.m; sourceTree = "<group>"; };
1ACFCDE2219EB28A00E2C237 /* CocoaHTTPServer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CocoaHTTPServer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1ACFCDE5219EB28A00E2C237 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1ACFCDFB219EB2AB00E2C237 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1ACFCDFC219EB2AB00E2C237 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
1ACFCDFE219EB2AB00E2C237 /* README.markdown */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.markdown; sourceTree = "<group>"; };
1ACFCE00219EB2AB00E2C237 /* HTTPConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPConnection.h; sourceTree = "<group>"; };
@@ -192,7 +188,6 @@
1ACFCF1B219EB2AC00E2C237 /* GCDAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocket.m; sourceTree = "<group>"; };
1ACFCF1C219EB2AC00E2C237 /* About.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = About.txt; sourceTree = "<group>"; };
1ACFCF1D219EB2AC00E2C237 /* GCDAsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncSocket.h; sourceTree = "<group>"; };
1ACFCFE0219EB37000E2C237 /* CocoaHTTPServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocoaHTTPServer.h; sourceTree = "<group>"; };
1ACFCFE2219EB45300E2C237 /* MBIMHTTPConnection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBIMHTTPConnection.h; sourceTree = "<group>"; };
1ACFCFE3219EB45300E2C237 /* MBIMHTTPConnection.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MBIMHTTPConnection.m; sourceTree = "<group>"; };
CD14F18B219E2DB400E7DD22 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -338,13 +333,10 @@
1ACFCDE3219EB28A00E2C237 /* CocoaHTTPServer */ = {
isa = PBXGroup;
children = (
1ACFCFE0219EB37000E2C237 /* CocoaHTTPServer.h */,
1ACFCDFF219EB2AB00E2C237 /* Core */,
1ACFCDFB219EB2AB00E2C237 /* Info.plist */,
1ACFCDFC219EB2AB00E2C237 /* LICENSE.txt */,
1ACFCDFE219EB2AB00E2C237 /* README.markdown */,
1ACFCF07219EB2AC00E2C237 /* Vendor */,
1ACFCDE5219EB28A00E2C237 /* Info.plist */,
);
path = CocoaHTTPServer;
sourceTree = "<group>";
@@ -541,7 +533,6 @@
1ACFCF2E219EB2AC00E2C237 /* HTTPAuthenticationRequest.h in Headers */,
1ACFCFDC219EB2AC00E2C237 /* GCDAsyncSocket.h in Headers */,
1ACFCF4A219EB2AC00E2C237 /* DDNumber.h in Headers */,
1ACFCFE1219EB37000E2C237 /* CocoaHTTPServer.h in Headers */,
1ACFCF3F219EB2AC00E2C237 /* HTTPResponse.h in Headers */,
1ACFCF39219EB2AC00E2C237 /* HTTPFileResponse.h in Headers */,
1ACFCFCF219EB2AC00E2C237 /* ContextFilterLogFormatter.h in Headers */,
@@ -692,7 +683,6 @@
1ACFCFD3219EB2AC00E2C237 /* README.txt in Resources */,
1ACFCF27219EB2AC00E2C237 /* LICENSE.txt in Resources */,
1ACFCFDB219EB2AC00E2C237 /* About.txt in Resources */,
1ACFCF26219EB2AC00E2C237 /* Info.plist in Resources */,
1ACFCF29219EB2AC00E2C237 /* README.markdown in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -921,7 +911,6 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = CocoaHTTPServer/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@@ -950,7 +939,6 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = CocoaHTTPServer/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",

View File

@@ -11,7 +11,7 @@
#import "MBIMHTTPConnection.h"
#import "hooking.h"
#import <CocoaHTTPServer/CocoaHTTPServer.h>
#import <CocoaHTTPServer/HTTPServer.h>
#import <IMCore/IMCore.h>
#import <IMCore/IMCore_Private.h>

View File

@@ -6,7 +6,7 @@
// Copyright © 2018 James Magahern. All rights reserved.
//
#import <CocoaHTTPServer/CocoaHTTPServer.h>
#import <CocoaHTTPServer/HTTPConnection.h>
@interface MBIMHTTPConnection : HTTPConnection

View File

@@ -7,6 +7,7 @@
//
#import "MBIMHTTPConnection.h"
#import "MBIMBridge.h"
#import "MBIMBridgeOperation.h"

View File

@@ -7,13 +7,14 @@
//
#import <Foundation/Foundation.h>
#import <CocoaHTTPServer/CocoaHTTPServer.h>
#import <CocoaHTTPServer/HTTPResponse.h>
#import <CocoaHTTPServer/HTTPErrorResponse.h>
#import "MBIMJSONDataResponse.h"
NS_ASSUME_NONNULL_BEGIN
typedef void (^MBIMBridgeOperationCompletionBlock)(NSObject * _Nullable response);
typedef void (^MBIMBridgeOperationCompletionBlock)(NSObject<HTTPResponse> * _Nullable response);
@interface MBIMBridgeOperation : NSOperation
@property (class, nonatomic, readonly) NSString *endpointName;

View File

@@ -7,7 +7,7 @@
//
#import <Foundation/Foundation.h>
#import <CocoaHTTPServer/CocoaHTTPServer.h>
#import <CocoaHTTPServer/HTTPDataResponse.h>
@interface MBIMJSONDataResponse : HTTPDataResponse