updated fbsimctl due to terminate bugfix (wait reduced from 10 seconds to 1 seconds)

Author: talkol

detox/bin/fbsimctl/FBControlCore.framework/FBControlCore

@@ -9,6 +9,8 @@
 
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  Defines an interface for interacting with iOS Applications.
  */
@@ -33,3 +35,5 @@
 - (BOOL)isApplicationInstalledWithBundleID:(NSString *)bundleID error:(NSError **)error;
 
 @end
+
+NS_ASSUME_NONNULL_END

detox/bin/fbsimctl/FBControlCore.framework/Headers/FBApplicationCommands.h

@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import <FBControlCore/FBJSONConversion.h>
+#import <FBControlCore/FBDebugDescribeable.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class FBBinaryDescriptor;
+
+/**
+ Concrete value wrapper around a Application artifact.
+ */
+@interface FBApplicationDescriptor : NSObject <NSCopying, NSCoding, FBJSONSerializable, FBDebugDescribeable>
+
+/**
+ The Designated Initializer.
+
+ @param name the Name of the Application. See CFBundleName. Must not be nil.
+ @param path The Path to the Application Bundle. Must not be nil.
+ @param bundleID the Bundle ID of the Application. Must not be nil.
+ @param binary the Path to the binary inside the Application. Must not be nil.
+ @returns a new FBApplicationDescriptor instance.
+ */
+- (instancetype)initWithName:(NSString *)name path:(NSString *)path bundleID:(NSString *)bundleID binary:(FBBinaryDescriptor *)binary;
+
+/**
+ An initializer for FBApplicationDescriptor that checks the nullability of the arguments
+
+ @param name the Name of the Application. See CFBundleName. Must not be nil.
+ @param path The Path to the Application Bundle. May be nil.
+ @param bundleID the Bundle ID of the Application. May be nil.
+ @param binary the Path to the binary inside the Application. May be nil.
+ @returns a new FBApplicationDescriptor instance, if all arguments are non-nil. Nil otherwise
+ */
++ (nullable instancetype)withName:(NSString *)name path:(NSString *)path bundleID:(NSString *)bundleID binary:(FBBinaryDescriptor *)binary;
+
+/**
+ The name of the Application. See CFBundleName.
+ */
+@property (nonatomic, copy, readonly) NSString *name;
+
+/**
+ The File Path to the Application.
+ */
+@property (nonatomic, copy, readonly) NSString *path;
+
+/**
+ The Bundle Identifier of the Application. See CFBundleIdentifier.
+ */
+@property (nonatomic, copy, readonly) NSString *bundleID;
+
+/**
+ The Executable Binary contained within the Application's Bundle.
+ */
+@property (nonatomic, copy, readonly) FBBinaryDescriptor *binary;
+
+@end
+
+/**
+ Conveniences for building FBApplicationDescriptor instances.
+ */
+@interface FBApplicationDescriptor (Helpers)
+
+/**
+ Constructs a FBApplicationDescriptor for the Application at the given path.
+
+ @param path the path of the applocation to construct.
+ @param error an error out.
+ @returns a FBApplicationDescriptor instance if one could be constructed, nil otherwise.
+ */
++ (nullable instancetype)applicationWithPath:(NSString *)path error:(NSError **)error;
+
+/**
+ Returns the FBApplicationDescriptor for the current version of Xcode's Simulator.app.
+ Will assert if the FBApplicationDescriptor instance could not be constructed.
+
+ @return A FBApplicationDescriptor instance for the Simulator.app.
+ */
++ (instancetype)xcodeSimulator;
+
+/**
+ Returns the System Application with the provided name.
+
+ @param appName the System Application to fetch.
+ @param error any error that occurred in fetching the application.
+ @returns FBApplicationDescriptor instance if one could for the given name could be found, nil otherwise.
+ */
++ (nullable instancetype)systemApplicationNamed:(NSString *)appName error:(NSError **)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

detox/bin/fbsimctl/FBControlCore.framework/Headers/FBApplicationDescriptor.h

@@ -0,0 +1,82 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import <FBControlCore/FBDebugDescribeable.h>
+#import <FBControlCore/FBJSONConversion.h>
+
+@class FBDiagnostic;
+@class FBLogSearchPredicate;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Defines a model for the result of a batch search on diagnostics.
+ */
+@interface FBBatchLogSearchResult : NSObject <NSCopying, NSCoding, FBJSONSerializable, FBJSONDeserializable, FBDebugDescribeable>
+
+/**
+ The Results as a Mapping:
+ The returned dictionary is a NSDictionary where:
+ - The keys are the log names. A log must have 1 or more matches to have a key.
+ - The values are an NSArrray of NSStrings for the lines that have been matched.
+ */
+@property (nonatomic, copy, readonly) NSDictionary<NSString *, NSArray<NSString *> *> *mapping;
+
+/**
+ Returns all matches from all elements in the mapping
+ */
+- (NSArray<NSString *> *)allMatches;
+
+@end
+
+/**
+ Defines a model for batch searching diagnostics.
+ This model is then used to concurrently search logs, returning the relevant matches.
+
+ Diagnostics are defined in terms of thier short_name.
+ Logs are defined in terms of Search Predicates.
+ */
+@interface FBBatchLogSearch : NSObject <NSCopying, NSCoding, FBJSONSerializable, FBJSONDeserializable, FBDebugDescribeable>
+
+/**
+ Constructs a Batch Log Search for the provided mapping of log names to predicates.
+ The provided mapping is an NSDictionary where:
+ - The keys are the names of the Diagnostics to search. The empty string matches against all input diagnostics.
+ - The values are an NSArray of FBLogSearchPredicates of the predicates to search the the diagnostic with.
+
+ @param mapping the mapping to search with.
+ @param lines YES to include the full line in the output, NO for the matched substring.
+ @param error an error out for any error in the mapping format.
+ @return an FBBatchLogSearch instance if the mapping is valid, nil otherwise.
+ */
++ (instancetype)withMapping:(NSDictionary<NSArray<NSString *> *, NSArray<FBLogSearchPredicate *> *> *)mapping lines:(BOOL)lines error:(NSError **)error;
+
+/**
+ Runs the Reciever over an array of Diagnostics.
+
+ @param diagnostics an NSArray of FBDiagnostics to search.
+ @return a search result
+ */
+- (FBBatchLogSearchResult *)search:(NSArray<FBDiagnostic *> *)diagnostics;
+
+/**
+ Convenience method for searching an array of diagnostics with a single predicate.
+
+ @param diagnostics an NSArray of FBDiagnostics to search.
+ @param predicate a Log Search Predicate to search with.
+ @param lines YES to include the full line in the output, NO for the matched substring.
+ @return a NSDictionary specified by -[FBBatchLogSearchResult mapping].
+ */
++ (NSDictionary<NSString *, NSArray<NSString *> *> *)searchDiagnostics:(NSArray<FBDiagnostic *> *)diagnostics withPredicate:(FBLogSearchPredicate *)predicate lines:(BOOL)lines;
+
+@end
+
+NS_ASSUME_NONNULL_END

detox/bin/fbsimctl/FBControlCore.framework/Headers/FBBatchLogSearch.h

@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import <FBControlCore/FBJSONConversion.h>
+#import <FBControlCore/FBDebugDescribeable.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Concrete value wrapper around a binary artifact.
+ */
+@interface FBBinaryDescriptor : NSObject <NSCopying, NSCoding, FBJSONSerializable, FBJSONDeserializable, FBDebugDescribeable>
+
+/**
+ The Designated Initializer.
+
+ @param name The name of the executable. Must not be nil.
+ @param path The path to the executable. Must not be nil.
+ @param architectures The supported architectures of the executable. Must not be nil.
+ @returns a new FBBinaryDescriptor instance.
+ */
+- (instancetype)initWithName:(NSString *)name path:(NSString *)path architectures:(NSSet *)architectures;
+
+/**
+ An initializer for FBBinaryDescriptor that checks the nullability of the arguments
+
+ @param name The name of the executable. May be nil.
+ @param path The path to the executable. May be nil.
+ @param architectures The supported architectures of the executable. Must not be nil.
+ @returns a new FBBinaryDescriptor instance, if all arguments are non-nil. Nil otherwise.
+ */
++ (nullable instancetype)withName:(NSString *)name path:(NSString *)path architectures:(NSSet *)architectures;
+
+/**
+ The Name of the Executable.
+ */
+@property (nonatomic, copy, readonly) NSString *name;
+
+/**
+ The File Path to the Executable.
+ */
+@property (nonatomic, copy, readonly) NSString *path;
+
+/**
+ The Supported Architectures of the Executable.
+ */
+@property (nonatomic, copy, readonly) NSSet *architectures;
+
+@end
+
+/**
+ Conveniences for building FBBinaryDescriptor instances
+ */
+@interface FBBinaryDescriptor (Helpers)
+
+/**
+ Returns the FBBinaryDescriptor for the given binary path
+ */
++ (nullable instancetype)binaryWithPath:(NSString *)path error:(NSError **)error;
+
+/**
+ Returns the launchctl for the current version of Xcode's of the Simulator Platform.
+ Will assert if the FBBinaryDescriptor instance could not be constructed.
+
+ @return a FBBinaryDescriptor instance launchctl.
+ */
++ (instancetype)launchCtl;
+
+@end
+
+NS_ASSUME_NONNULL_END

detox/bin/fbsimctl/FBControlCore.framework/Headers/FBBinaryDescriptor.h

@@ -8,7 +8,10 @@
  */
 
 #import <FBControlCore/FBApplicationCommands.h>
+#import <FBControlCore/FBApplicationDescriptor.h>
+#import <FBControlCore/FBBinaryDescriptor.h>
 #import <FBControlCore/FBASLParser.h>
+#import <FBControlCore/FBBatchLogSearch.h>
 #import <FBControlCore/FBBinaryParser.h>
 #import <FBControlCore/FBCapacityQueue.h>
 #import <FBControlCore/FBCollectionInformation.h>

detox/bin/fbsimctl/FBControlCore.framework/Headers/FBControlCore.h

@@ -34,11 +34,6 @@ extern NSString *const FBControlCoreDebugLogging;
  */
 + (NSString *)developerDirectory;
 
-/**
- The File Path to of Xcode's Info.plist, defined by the Developer Directory.
- */
-+ (NSString *)xcodeInfoPlistPath;
-
 /**
  The File Path of Apple's 'Apple Configurator' Application, if installed.
  */

detox/bin/fbsimctl/FBControlCore.framework/Headers/FBControlCoreGlobalConfiguration.h

@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <Foundation/Foundation.h>
+
+/**
+ Protocol for denoting objects that are serializable with NSJSONSerialization.
+ */
+@protocol FBJSONSerializationDescribeable
+
+/**
+ Returns an NSJSONSerialization-compatible representation of the reciever.
+ For more information about permitted types, refer the the NSJSONSerialization Documentation.
+
+ @return an NSJSONSerialization-compatible representation of the reciever.
+ */
+- (id)jsonSerializableRepresentation;
+
+@end