Skip to content

Commit 0495352

Browse files
shazronshazron
committed
Merge pull request #73 from phonegap/issue-72
Fixes #72 - Xcode 5.1 use of new PrivateFrameworks for iPhoneSimulatorClient
2 parents 59fab3e + b9a7e69 commit 0495352

File tree

8 files changed

+411
-151
lines changed

8 files changed

+411
-151
lines changed

‎DVTiPhoneSimulatorRemoteClient/DVTiPhoneSimulatorRemoteClient.h

Lines changed: 290 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,290 @@
1+
//
2+
// Generated by class-dump 3.5 (64 bit).
3+
//
4+
// class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
5+
//
6+
7+
#pragma mark Blocks
8+
9+
typedef void (^CDUnknownBlockType)(void); // return type and parameters are unknown
10+
11+
#pragma mark -
12+
13+
//
14+
// File: $(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks/DVTiPhoneSimulatorRemoteClient.framework/Versions/A/DVTiPhoneSimulatorRemoteClient
15+
//
16+
// Arch: x86_64
17+
// Current version: 12.0.0
18+
// Compatibility version: 1.0.0
19+
// Source version: 5037.3.0.0.0
20+
// Minimum Mac OS X version: 10.8.0
21+
// SDK version: 10.9.0
22+
//
23+
// Objective-C Garbage Collection: Unsupported
24+
//
25+
// Run path: @loader_path/../../../../PrivateFrameworks/
26+
// = $(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks
27+
//
28+
29+
30+
@class DTiPhoneSimulatorApplicationSpecifier;
31+
@class DTiPhoneSimulatorSession;
32+
@class DTiPhoneSimulatorSessionConfig;
33+
@class DTiPhoneSimulatorSystemRoot;
34+
@class DVTiPhoneSimulatorMessenger;
35+
36+
@protocol DTiPhoneSimulatorSessionDelegate
37+
38+
- (void) session: (DTiPhoneSimulatorSession *) session didEndWithError: (NSError *) error;
39+
- (void) session: (DTiPhoneSimulatorSession *) session didStart: (BOOL) started withError: (NSError *) error;
40+
41+
@end
42+
43+
@protocol OS_dispatch_source
44+
@end
45+
@protocol OS_dispatch_queue
46+
@end
47+
@class DVTDispatchLock;
48+
@class DVTConfinementServiceConnection;
49+
@class DVTTask;
50+
51+
52+
@interface DVTiPhoneSimulatorMessenger : NSObject
53+
{
54+
DTiPhoneSimulatorSession *_session;
55+
CDUnknownBlockType _readyMessageHandler;
56+
CDUnknownBlockType _runningMessageHandler;
57+
CDUnknownBlockType _appDidLaunchMessageHandler;
58+
CDUnknownBlockType _appDidQuitMessageHandler;
59+
CDUnknownBlockType _appPIDExitedMessageHandler;
60+
CDUnknownBlockType _toolDidLaunchMessageHandler;
61+
}
62+
63+
+ (id)messengerForSession:(id)arg1 withConnection:(id)arg2;
64+
+ (id)messengerForSession:(id)arg1;
65+
@property(copy, nonatomic) CDUnknownBlockType toolDidLaunchMessageHandler; // @synthesize toolDidLaunchMessageHandler=_toolDidLaunchMessageHandler;
66+
@property(copy, nonatomic) CDUnknownBlockType appPIDExitedMessageHandler; // @synthesize appPIDExitedMessageHandler=_appPIDExitedMessageHandler;
67+
@property(copy, nonatomic) CDUnknownBlockType appDidQuitMessageHandler; // @synthesize appDidQuitMessageHandler=_appDidQuitMessageHandler;
68+
@property(copy, nonatomic) CDUnknownBlockType appDidLaunchMessageHandler; // @synthesize appDidLaunchMessageHandler=_appDidLaunchMessageHandler;
69+
@property(copy, nonatomic) CDUnknownBlockType runningMessageHandler; // @synthesize runningMessageHandler=_runningMessageHandler;
70+
@property(copy, nonatomic) CDUnknownBlockType readyMessageHandler; // @synthesize readyMessageHandler=_readyMessageHandler;
71+
@property(readonly) DTiPhoneSimulatorSession *session; // @synthesize session=_session;
72+
- (void)doUbiquityFetchEvent;
73+
- (void)doFetchEventForPID:(int)arg1;
74+
- (void)backgroundAllApps:(int)arg1;
75+
- (void)startSimulatorToolSessionWithParameters:(id)arg1;
76+
- (void)stopSimulatingLocation;
77+
- (void)startSimulatingLocationWithLatitude:(id)arg1 longitute:(id)arg2;
78+
- (void)endSimulatorSessionWithPID:(int)arg1;
79+
- (void)startSimulatorSessionWithRequestInfo:(id)arg1;
80+
- (void)clearAllMessageHandlers;
81+
- (void)waitPID:(int)arg1 withAppPIDExitedMessagedHandler:(CDUnknownBlockType)arg2;
82+
- (void)disconnectFromService;
83+
- (BOOL)connectToServiceWithSessionOnLaunch:(BOOL)arg1 simulatorPID:(int *)arg2 error:(id *)arg3;
84+
- (id)initWithSession:(id)arg1;
85+
86+
@end
87+
88+
@interface DVTiPhoneSimulatorLocalMessenger : DVTiPhoneSimulatorMessenger
89+
{
90+
BOOL _appTerminationMessageSent;
91+
NSObject<OS_dispatch_source> *_pidDispatchSource;
92+
DVTTask *_simTask;
93+
}
94+
95+
- (void)doUbiquityFetchEvent;
96+
- (void)doFetchEventForPID:(int)arg1;
97+
- (void)backgroundAllApps:(int)arg1;
98+
- (void)_handleSimulatorToolDidLaunchMessage:(id)arg1;
99+
- (void)setToolDidLaunchMessageHandler:(CDUnknownBlockType)arg1;
100+
- (void)waitPID:(int)arg1 withAppPIDExitedMessagedHandler:(CDUnknownBlockType)arg2;
101+
- (void)_handleSimulatorAppDidQuitMessage:(id)arg1;
102+
- (void)setAppDidQuitMessageHandler:(CDUnknownBlockType)arg1;
103+
- (void)_handleSimulatorAppDidLaunchMessage:(id)arg1;
104+
- (void)setAppDidLaunchMessageHandler:(CDUnknownBlockType)arg1;
105+
- (void)_handleSimulatorRunningMessage:(id)arg1;
106+
- (void)setRunningMessageHandler:(CDUnknownBlockType)arg1;
107+
- (void)_handleSimulatorReadyMessage:(id)arg1;
108+
- (void)setReadyMessageHandler:(CDUnknownBlockType)arg1;
109+
- (void)startSimulatorToolSessionWithParameters:(id)arg1;
110+
- (void)stopSimulatingLocation;
111+
- (void)startSimulatingLocationWithLatitude:(id)arg1 longitute:(id)arg2;
112+
- (void)endSimulatorSessionWithPID:(int)arg1;
113+
- (void)startSimulatorSessionWithRequestInfo:(id)arg1;
114+
- (void)clearAllMessageHandlers;
115+
- (void)disconnectFromService;
116+
- (BOOL)connectToServiceWithSessionOnLaunch:(BOOL)arg1 simulatorPID:(int *)arg2 error:(id *)arg3;
117+
- (void)_enableObserver:(BOOL)arg1 forName:(id)arg2 selector:(SEL)arg3;
118+
119+
@end
120+
121+
@interface DVTiPhoneSimulatorRemoteMessenger : DVTiPhoneSimulatorMessenger
122+
{
123+
unsigned long long _commandTag;
124+
NSObject<OS_dispatch_queue> *_responseQueue;
125+
DVTDispatchLock *_awaitingLock;
126+
NSMutableDictionary *_awaitingSemaphores;
127+
NSMutableDictionary *_awaitingResponses;
128+
NSMutableSet *_waitingAppPIDs;
129+
DVTConfinementServiceConnection *_connection;
130+
}
131+
132+
@property(readonly) DVTConfinementServiceConnection *connection; // @synthesize connection=_connection;
133+
- (void)handleNotificationResponse:(id)arg1;
134+
- (void)waitPID:(int)arg1 withAppPIDExitedMessagedHandler:(CDUnknownBlockType)arg2;
135+
- (void)startSimulatorToolSessionWithParameters:(id)arg1;
136+
- (void)stopSimulatingLocation;
137+
- (void)startSimulatingLocationWithLatitude:(id)arg1 longitute:(id)arg2;
138+
- (void)endSimulatorSessionWithPID:(int)arg1;
139+
- (void)startSimulatorSessionWithRequestInfo:(id)arg1;
140+
- (void)disconnectFromService;
141+
- (BOOL)connectToServiceWithSessionOnLaunch:(BOOL)arg1 simulatorPID:(int *)arg2 error:(id *)arg3;
142+
- (BOOL)sendTaggedRequest:(id)arg1 awaitingResponse:(id *)arg2 error:(id *)arg3;
143+
- (id)nextCommandTag;
144+
- (id)awaitResponseWithTag:(id)arg1 error:(id *)arg2;
145+
- (void)enqueueResponse:(id)arg1 withTag:(id)arg2 error:(id)arg3;
146+
- (BOOL)sendRequest:(id)arg1 withTag:(id)arg2 error:(id *)arg3;
147+
- (id)initWithSession:(id)arg1 connection:(id)arg2;
148+
149+
@end
150+
151+
@interface DTiPhoneSimulatorSession : NSObject
152+
{
153+
int _simulatedApplicationPID;
154+
int _simulatorPID;
155+
NSString *_uuid;
156+
id <DTiPhoneSimulatorSessionDelegate> _delegate;
157+
NSString *_simulatedAppPath;
158+
long long _sessionLifecycleProgress;
159+
NSTimer *_timeoutTimer;
160+
DTiPhoneSimulatorSessionConfig *_sessionConfig;
161+
DVTiPhoneSimulatorMessenger *_messenger;
162+
}
163+
164+
@property(retain) DVTiPhoneSimulatorMessenger *messenger; // @synthesize messenger=_messenger;
165+
@property(copy, nonatomic) DTiPhoneSimulatorSessionConfig *sessionConfig; // @synthesize sessionConfig=_sessionConfig;
166+
@property(retain, nonatomic) NSTimer *timeoutTimer; // @synthesize timeoutTimer=_timeoutTimer;
167+
@property(nonatomic) long long sessionLifecycleProgress; // @synthesize sessionLifecycleProgress=_sessionLifecycleProgress;
168+
@property int simulatorPID; // @synthesize simulatorPID=_simulatorPID;
169+
@property(copy) NSString *simulatedAppPath; // @synthesize simulatedAppPath=_simulatedAppPath;
170+
@property int simulatedApplicationPID; // @synthesize simulatedApplicationPID=_simulatedApplicationPID;
171+
@property(retain, nonatomic) id <DTiPhoneSimulatorSessionDelegate> delegate; // @synthesize delegate=_delegate;
172+
@property(copy, nonatomic) NSString *uuid; // @synthesize uuid=_uuid;
173+
- (void)doUbiquityFetchEvent;
174+
- (void)doFetchEventForPID:(int)arg1;
175+
- (void)backgroundAllApps:(int)arg1;
176+
- (id)_invalidConfigError;
177+
- (void)_endSimulatorSession;
178+
- (void)_callDelegateResponseFromSessionEndedInfo:(id)arg1;
179+
- (void)_callDelegateResponseFromSessionStartedInfo:(id)arg1;
180+
- (id)_sessionStartRequestInfoFromConfig:(id)arg1 withError:(id *)arg2;
181+
- (BOOL)_startToolSessionInSimulatorWithError:(id *)arg1;
182+
- (BOOL)_startApplicationSessionInSimulatorWithError:(id *)arg1;
183+
- (BOOL)_startBasicSessionInSimulatorWithError:(id *)arg1;
184+
- (BOOL)_startSessionInSimulatorWithError:(id *)arg1;
185+
- (BOOL)_handleSessionEndedInSimulator:(id)arg1 notification:(id)arg2;
186+
- (void)_handleSessionStartedWithSim:(id)arg1;
187+
- (void)_handleSessionStartedInSimulator:(id)arg1;
188+
- (void)_handleSimulatorReadyMessage:(id)arg1;
189+
- (void)_timeoutElapsed:(id)arg1;
190+
- (BOOL)attachedToTargetWithConfig:(id)arg1 error:(id *)arg2;
191+
- (void)stopLocationSimulation;
192+
- (void)simulateLocationWithLatitude:(id)arg1 longitude:(id)arg2;
193+
- (void)requestEndWithTimeout:(double)arg1;
194+
- (BOOL)requestStartWithConfig:(id)arg1 timeout:(double)arg2 error:(id *)arg3;
195+
- (BOOL)_setUpSimulatorMessengerWithConfig:(id)arg1 error:(id *)arg2;
196+
- (id)description;
197+
- (void)dealloc;
198+
- (id)init;
199+
200+
@end
201+
202+
@interface DTiPhoneSimulatorSessionConfig : NSObject <NSCopying>
203+
{
204+
BOOL _launchForBackgroundFetch;
205+
BOOL _simulatedApplicationShouldWaitForDebugger;
206+
NSString *_localizedClientName;
207+
DTiPhoneSimulatorSystemRoot *_simulatedSystemRoot;
208+
NSString *_simulatedDeviceInfoName;
209+
NSNumber *_simulatedDeviceFamily;
210+
NSString *_simulatedArchitecture;
211+
NSNumber *_simulatedDisplayHeight;
212+
NSNumber *_simulatedDisplayScale;
213+
DTiPhoneSimulatorApplicationSpecifier *_applicationToSimulateOnStart;
214+
NSNumber *_pid;
215+
NSArray *_simulatedApplicationLaunchArgs;
216+
NSDictionary *_simulatedApplicationLaunchEnvironment;
217+
NSString *_simulatedApplicationStdOutPath;
218+
NSString *_simulatedApplicationStdErrPath;
219+
NSFileHandle *_stdinFileHandle;
220+
NSFileHandle *_stdoutFileHandle;
221+
NSFileHandle *_stderrFileHandle;
222+
id _confinementService;
223+
}
224+
225+
+ (id)displayNameForDeviceFamily:(id)arg1;
226+
@property(retain) id confinementService; // @synthesize confinementService=_confinementService;
227+
@property(retain) NSFileHandle *stderrFileHandle; // @synthesize stderrFileHandle=_stderrFileHandle;
228+
@property(retain) NSFileHandle *stdoutFileHandle; // @synthesize stdoutFileHandle=_stdoutFileHandle;
229+
@property(retain) NSFileHandle *stdinFileHandle; // @synthesize stdinFileHandle=_stdinFileHandle;
230+
@property(copy) NSString *simulatedApplicationStdErrPath; // @synthesize simulatedApplicationStdErrPath=_simulatedApplicationStdErrPath;
231+
@property(copy) NSString *simulatedApplicationStdOutPath; // @synthesize simulatedApplicationStdOutPath=_simulatedApplicationStdOutPath;
232+
@property BOOL simulatedApplicationShouldWaitForDebugger; // @synthesize simulatedApplicationShouldWaitForDebugger=_simulatedApplicationShouldWaitForDebugger;
233+
@property(copy) NSDictionary *simulatedApplicationLaunchEnvironment; // @synthesize simulatedApplicationLaunchEnvironment=_simulatedApplicationLaunchEnvironment;
234+
@property(copy) NSArray *simulatedApplicationLaunchArgs; // @synthesize simulatedApplicationLaunchArgs=_simulatedApplicationLaunchArgs;
235+
@property(copy) NSNumber *pid; // @synthesize pid=_pid;
236+
@property(copy) DTiPhoneSimulatorApplicationSpecifier *applicationToSimulateOnStart; // @synthesize applicationToSimulateOnStart=_applicationToSimulateOnStart;
237+
@property(copy) NSNumber *simulatedDisplayScale; // @synthesize simulatedDisplayScale=_simulatedDisplayScale;
238+
@property(copy) NSNumber *simulatedDisplayHeight; // @synthesize simulatedDisplayHeight=_simulatedDisplayHeight;
239+
@property(copy) NSString *simulatedArchitecture; // @synthesize simulatedArchitecture=_simulatedArchitecture;
240+
@property(copy) NSNumber *simulatedDeviceFamily; // @synthesize simulatedDeviceFamily=_simulatedDeviceFamily;
241+
@property(retain) NSString *simulatedDeviceInfoName; // @synthesize simulatedDeviceInfoName=_simulatedDeviceInfoName;
242+
@property(copy) DTiPhoneSimulatorSystemRoot *simulatedSystemRoot; // @synthesize simulatedSystemRoot=_simulatedSystemRoot;
243+
@property(copy) NSString *localizedClientName; // @synthesize localizedClientName=_localizedClientName;
244+
@property BOOL launchForBackgroundFetch; // @synthesize launchForBackgroundFetch=_launchForBackgroundFetch;
245+
- (id)description;
246+
- (id)copyWithZone:(struct _NSZone *)arg1;
247+
- (id)init;
248+
249+
@end
250+
251+
@interface DTiPhoneSimulatorSystemRoot : NSObject <NSCopying>
252+
{
253+
NSString *sdkRootPath;
254+
NSString *sdkVersion;
255+
NSString *sdkDisplayName;
256+
}
257+
258+
+ (id)rootWithSDKVersion:(id)arg1;
259+
+ (id)rootWithSDKPath:(id)arg1;
260+
+ (id)defaultRoot;
261+
+ (id)knownRoots;
262+
+ (void)initialize;
263+
@property(copy) NSString *sdkDisplayName; // @synthesize sdkDisplayName;
264+
@property(copy) NSString *sdkVersion; // @synthesize sdkVersion;
265+
@property(copy) NSString *sdkRootPath; // @synthesize sdkRootPath;
266+
- (id)description;
267+
- (long long)compare:(id)arg1;
268+
- (id)copyWithZone:(struct _NSZone *)arg1;
269+
- (BOOL)isEqual:(id)arg1;
270+
- (id)initWithSDKPath:(id)arg1;
271+
272+
@end
273+
274+
@interface DTiPhoneSimulatorApplicationSpecifier : NSObject <NSCopying>
275+
{
276+
NSString *appPath;
277+
NSString *bundleID;
278+
NSString *toolPath;
279+
}
280+
281+
+ (id)specifierWithToolPath:(id)arg1;
282+
+ (id)specifierWithApplicationBundleIdentifier:(id)arg1;
283+
+ (id)specifierWithApplicationPath:(id)arg1;
284+
@property(copy, nonatomic) NSString *toolPath; // @synthesize toolPath;
285+
@property(copy, nonatomic) NSString *bundleID; // @synthesize bundleID;
286+
@property(copy, nonatomic) NSString *appPath; // @synthesize appPath;
287+
- (id)description;
288+
- (id)copyWithZone:(struct _NSZone *)arg1;
289+
290+
@end

‎Source/iPhoneSimulator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#import <Foundation/Foundation.h>
9-
#import <iPhoneSimulatorRemoteClient/iPhoneSimulatorRemoteClient.h>
9+
#import <DVTiPhoneSimulatorRemoteClient/DVTiPhoneSimulatorRemoteClient.h>
1010
#import "version.h"
1111

1212
@interface iPhoneSimulator : NSObject <DTiPhoneSimulatorSessionDelegate> {

0 commit comments

Comments
 (0)