appium-webdriveragent 3.15.1 → 4.1.3

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.h

@@ -11,6 +11,7 @@
 
 @class XCElementSnapshot;
 @class XCAccessibilityElement;
+@class FBXMLGenerationOptions;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -25,15 +26,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (BOOL)fb_deactivateWithDuration:(NSTimeInterval)duration error:(NSError **)error;
 
-/**
- Resets the authorization status for a protected resource. Available since Xcode 11.4
-
- @param resourceId A valid resource id to reset the auth status for. See https://developer.apple.com/documentation/xctest/xcuiprotectedresource?language=objc
- @param error If there is an error, upon return contains an NSError object that describes the problem.
- @return YES if the operation succeeds, otherwise NO.
- */
-- (BOOL)fb_resetAuthorizationStatusForResource:(long long)resourceId error:(NSError **)error;
-
 /**
  Return application elements tree in form of nested dictionaries
  */
@@ -45,18 +37,20 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSDictionary *)fb_accessibilityTree;
 
 /**
- Return application elements tree in form of xml string
+ Return application elements tree in a form of xml string
+ with default options.
+
+ @return nil if there was a failure while retriveing the page source.
  */
 - (nullable NSString *)fb_xmlRepresentation;
 
 /**
- Return application elements tree in form of xml string exluding the given attribute names.
+ Return application elements tree in a form of xml string
 
- @param excludedAttributes the list of XML attribute names to be excluded from the resulting document.
- Invalid attribute names are silently skipped
- @returns The XML representation of the current element as a string
+ @param options Optional values that affect the resulting XML generation process.
+ @return nil if there was a failure while retriveing the page source.
  */
-- (NSString *)fb_xmlRepresentationWithoutAttributes:(NSArray<NSString *> *)excludedAttributes;
+- (nullable NSString *)fb_xmlRepresentationWithOptions:(nullable FBXMLGenerationOptions *)options;
 
 /**
  Return application elements tree in form of internal XCTest debugDescription string

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m

@@ -20,6 +20,7 @@
 #import "FBXPath.h"
 #import "FBXCTestDaemonsProxy.h"
 #import "FBXCAXClientProxy.h"
+#import "FBXMLGenerationOptions.h"
 #import "XCAccessibilityElement.h"
 #import "XCElementSnapshot+FBHelpers.h"
 #import "XCUIDevice+FBHelpers.h"
@@ -180,15 +181,12 @@ static NSString* const FBUnknownBundleId = @"unknown";
 
 - (NSString *)fb_xmlRepresentation
 {
-  return [FBXPath xmlStringWithRootElement:self excludingAttributes:nil];
+  return [self fb_xmlRepresentationWithOptions:nil];
 }
 
-- (NSString *)fb_xmlRepresentationWithoutAttributes:(NSArray<NSString *> *)excludedAttributes
+- (NSString *)fb_xmlRepresentationWithOptions:(FBXMLGenerationOptions *)options
 {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnullable-to-nonnull-conversion"
-  return [FBXPath xmlStringWithRootElement:self excludingAttributes:excludedAttributes];
-#pragma clang diagnostic pop
+  return [FBXPath xmlStringWithRootElement:self options:options];
 }
 
 - (NSString *)fb_descriptionRepresentation
@@ -219,22 +217,6 @@ static NSString* const FBUnknownBundleId = @"unknown";
 }
 #endif
 
-- (BOOL)fb_resetAuthorizationStatusForResource:(long long)resourceId error:(NSError **)error
-{
-  SEL selector = NSSelectorFromString(@"resetAuthorizationStatusForResource:");
-  if (![self respondsToSelector:selector]) {
-    return [[[FBErrorBuilder builder]
-             withDescription:@"'resetAuthorizationStatusForResource' API is only supported for Xcode SDK 11.4 and later"]
-            buildError:error];
-  }
-  NSMethodSignature *signature = [self methodSignatureForSelector:selector];
-  NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-  [invocation setSelector:selector];
-  [invocation setArgument:&resourceId atIndex:2]; // 0 and 1 are reserved
-  [invocation invokeWithTarget:self];
-  return YES;
-}
-
 - (BOOL)fb_dismissKeyboardWithKeyNames:(nullable NSArray<NSString *> *)keyNames
                                  error:(NSError **)error
 {

package/WebDriverAgentLib/Categories/XCUIElement+FBSwiping.h

@@ -16,8 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Performs swipe gesture on the element
  *
  * @param direction Swipe direction. The following values are supported: up, down, left and right
- * @param velocity Swipe speed in pixels per second. This parameter is only supported since Xcode 11.4
- * nil value means that the default velocity is going to be used.
+ * @param velocity Swipe speed in pixels per second
  */
 - (void)fb_swipeWithDirection:(NSString *)direction velocity:(nullable NSNumber*)velocity;
 

package/WebDriverAgentLib/Categories/XCUIElement+FBSwiping.m

@@ -18,11 +18,7 @@
 {
   double velocityValue = .0;
   if (nil != velocity) {
-    if ([self respondsToSelector:@selector(swipeUpWithVelocity:)]) {
-      velocityValue = [velocity doubleValue];
-    } else {
-      [FBLogger log:@"Custom velocity values are only supported since Xcode SDK 11.4. The default velocity will be used instead"];
-    }
+    velocityValue = [velocity doubleValue];
   }
 
   if (velocityValue > 0) {

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m

@@ -45,13 +45,7 @@
 {
   NSError *error = nil;
   self.fb_isResolvedFromCache = @(NO);
-  if (self.query.fb_isUniqueSnapshotSupported) {
-    self.lastSnapshot = [self.fb_query fb_uniqueSnapshotWithError:&error];
-  } else {
-    self.lastSnapshot = nil;
-    // TODO: Remove this branch after Xcode10 support is dropped
-    [self fb_resolveWithError:&error];
-  }
+  self.lastSnapshot = [self.fb_query fb_uniqueSnapshotWithError:&error];
   if (nil == self.lastSnapshot) {
     NSString *hintText = @"Make sure the application UI has the expected state";
     if (nil != error

package/WebDriverAgentLib/Commands/FBAlertViewCommands.m

@@ -38,8 +38,8 @@
 
 + (id<FBResponsePayload>)handleAlertGetTextCommand:(FBRouteRequest *)request
 {
-  FBSession *session = request.session;
-  NSString *alertText = [FBAlert alertWithApplication:session.activeApplication].text;
+  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  NSString *alertText = [FBAlert alertWithApplication:application].text;
   if (!alertText) {
     return FBResponseWithStatus([FBCommandStatus noAlertOpenErrorWithMessage:nil
                                                                    traceback:nil]);
@@ -73,9 +73,9 @@
 
 + (id<FBResponsePayload>)handleAlertAcceptCommand:(FBRouteRequest *)request
 {
-  FBSession *session = request.session;
+  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
   NSString *name = request.arguments[@"name"];
-  FBAlert *alert = [FBAlert alertWithApplication:session.activeApplication];
+  FBAlert *alert = [FBAlert alertWithApplication:application];
   NSError *error;
 
   if (!alert.isPresent) {
@@ -96,9 +96,9 @@
 
 + (id<FBResponsePayload>)handleAlertDismissCommand:(FBRouteRequest *)request
 {
-  FBSession *session = request.session;
+  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
   NSString *name = request.arguments[@"name"];
-  FBAlert *alert = [FBAlert alertWithApplication:session.activeApplication];
+  FBAlert *alert = [FBAlert alertWithApplication:application];
   NSError *error;
     
   if (!alert.isPresent) {

package/WebDriverAgentLib/Commands/FBCustomCommands.m

@@ -292,11 +292,7 @@
     NSString *errMsg = @"The 'resource' argument must be set to a valid resource identifier (numeric value). See https://developer.apple.com/documentation/xctest/xcuiprotectedresource?language=objc";
     return FBResponseWithStatus([FBCommandStatus invalidArgumentErrorWithMessage:errMsg traceback:nil]);
   }
-  NSError *error;
-  if (![request.session.activeApplication fb_resetAuthorizationStatusForResource:resource.longLongValue
-                                                                           error:&error]) {
-    return FBResponseWithUnknownError(error);
-  }
+  [request.session.activeApplication resetAuthorizationStatusForResource:(XCUIProtectedResource)resource.longLongValue];
   return FBResponseWithOK();
 }
 

package/WebDriverAgentLib/Commands/FBDebugCommands.m

@@ -12,6 +12,7 @@
 #import "FBApplication.h"
 #import "FBRouteRequest.h"
 #import "FBSession.h"
+#import "FBXMLGenerationOptions.h"
 #import "XCUIApplication+FBHelpers.h"
 #import "XCUIElement+FBUtilities.h"
 #import "FBXPath.h"
@@ -43,14 +44,16 @@ static NSString *const SOURCE_FORMAT_DESCRIPTION = @"description";
   // This method might be called without session
   FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
   NSString *sourceType = request.parameters[@"format"] ?: SOURCE_FORMAT_XML;
+  NSString *sourceScope = request.parameters[@"scope"];
   id result;
   if ([sourceType caseInsensitiveCompare:SOURCE_FORMAT_XML] == NSOrderedSame) {
     NSArray<NSString *> *excludedAttributes = nil == request.parameters[@"excluded_attributes"]
       ? nil
       : [request.parameters[@"excluded_attributes"] componentsSeparatedByString:@","];
-    result = nil == excludedAttributes
-      ? application.fb_xmlRepresentation
-      : [application fb_xmlRepresentationWithoutAttributes:(NSArray<NSString *> *)excludedAttributes];
+    result = [application fb_xmlRepresentationWithOptions:
+        [[[FBXMLGenerationOptions new]
+          withExcludedAttributes:excludedAttributes]
+         withScope:sourceScope]];
   } else if ([sourceType caseInsensitiveCompare:SOURCE_FORMAT_JSON] == NSOrderedSame) {
     result = application.fb_tree;
   } else if ([sourceType caseInsensitiveCompare:SOURCE_FORMAT_DESCRIPTION] == NSOrderedSame) {

package/WebDriverAgentLib/FBAlert.m

@@ -226,6 +226,7 @@
       ? buttons.firstObject
       : buttons.lastObject;
   }
+
   return nil == dismissButton
     ? [[[FBErrorBuilder builder]
         withDescriptionFormat:@"Failed to find dismiss button for alert: %@", self.alertElement]

package/WebDriverAgentLib/FBApplication.m

@@ -133,23 +133,12 @@ static const NSTimeInterval APP_STATE_CHANGE_TIMEOUT = 5.0;
    [[FBXCAXClientProxy.sharedClient systemApplication] processIdentifier]];
 }
 
-+ (instancetype)appWithPID:(pid_t)processID
-{
-  if ([NSProcessInfo processInfo].processIdentifier == processID) {
-    return nil;
-  }
-  return [super appWithPID:processID];
-}
-
 + (instancetype)applicationWithPID:(pid_t)processID
 {
   if ([NSProcessInfo processInfo].processIdentifier == processID) {
     return nil;
   }
-  if ([FBXCAXClientProxy.sharedClient hasProcessTracker]) {
-    return (FBApplication *)[FBXCAXClientProxy.sharedClient monitoredApplicationWithProcessIdentifier:processID];
-  }
-  return [super applicationWithPID:processID];
+  return (FBApplication *)[FBXCAXClientProxy.sharedClient monitoredApplicationWithProcessIdentifier:processID];
 }
 
 - (void)launch

package/WebDriverAgentLib/Utilities/FBFailureProofTestCase.m

@@ -23,18 +23,15 @@
 {
   [super setUp];
   self.continueAfterFailure = YES;
-  if ([self respondsToSelector:@selector(internalImplementation)]) {
-    // The `internalImplementation` API has been removed since Xcode 11.4
-    self.internalImplementation =
-      (_XCTestCaseImplementation *)[FBXCTestCaseImplementationFailureHoldingProxy
-                                    proxyWithXCTestCaseImplementation:self.internalImplementation];
-  } else {
-    // https://github.com/appium/appium/issues/13949
-    self.shouldSetShouldHaltWhenReceivesControl = NO;
-    self.shouldHaltWhenReceivesControl = NO;
-  }
+  // https://github.com/appium/appium/issues/13949
+  self.shouldSetShouldHaltWhenReceivesControl = NO;
+  self.shouldHaltWhenReceivesControl = NO;
 }
 
+
+/**
+ Override 'recordFailureWithDescription' to not stop by failures.
+ */
 - (void)recordFailureWithDescription:(NSString *)description
                               inFile:(NSString *)filePath
                               atLine:(NSUInteger)lineNumber

package/WebDriverAgentLib/Utilities/FBScreen.m

@@ -35,7 +35,9 @@
   if (!mainStatusBar || (expectVisibleBar && !mainStatusBar.fb_isVisible)) {
     return CGSizeZero;
   }
-  return mainStatusBar.frame.size;
+  CGSize result = mainStatusBar.frame.size;
+  // Workaround for https://github.com/appium/appium/issues/15961
+  return CGSizeMake(MAX(result.width, result.height), MIN(result.width, result.height));
 }
 
 @end

package/WebDriverAgentLib/Utilities/FBW3CActionsSynthesizer.m

@@ -519,22 +519,10 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
   // TODO: The current approach throws zero division error on execution
   // NSUInteger modifiers = [self collectModifersWithItems:allItems currentItemIndex:currentItemIndex];
   // [resultPath setModifiers:modifiers mergeWithCurrentModifierFlags:NO atOffset:0];
-  if ([resultPath respondsToSelector:@selector(typeText:atOffset:typingSpeed:)]) {
-    [resultPath typeText:text
-                atOffset:offset
-             typingSpeed:FBConfiguration.maxTypingFrequency];
-  } else if ([resultPath respondsToSelector:@selector(typeText:atOffset:typingSpeed:shouldRedact:)]) {
-    [resultPath typeText:text
-                atOffset:offset
-             typingSpeed:FBConfiguration.maxTypingFrequency
-            shouldRedact:YES];
-  } else {
-    NSString *description = @"typeText: selector signature has been unexpectedly changed in the current XCTest SDK. Consider switching to the most recent WDA version";
-    if (error) {
-      *error = [[FBErrorBuilder.builder withDescription:description] build];
-    }
-    return nil;
-  }
+  [resultPath typeText:text
+              atOffset:offset
+           typingSpeed:FBConfiguration.maxTypingFrequency
+          shouldRedact:YES];
   return @[resultPath];
 }
 

package/WebDriverAgentLib/Utilities/FBXCAXClientProxy.h

@@ -41,8 +41,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSDictionary *)attributesForElement:(XCAccessibilityElement *)element
                             attributes:(NSArray *)attributes;
 
-- (BOOL)hasProcessTracker;
-
 - (XCUIApplication *)monitoredApplicationWithProcessIdentifier:(int)pid;
 
 @end

package/WebDriverAgentLib/Utilities/FBXCAXClientProxy.m

@@ -52,11 +52,7 @@ static id FBAXClient = nil;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     instance = [[self alloc] init];
-    if ([XCAXClient_iOS.class respondsToSelector:@selector(sharedClient)]) {
-      FBAXClient = [XCAXClient_iOS sharedClient];
-    } else {
-      FBAXClient = [XCUIDevice.sharedDevice accessibilityInterface];
-    }
+    FBAXClient = [XCUIDevice.sharedDevice accessibilityInterface];
   });
   return instance;
 }
@@ -81,18 +77,13 @@ static id FBAXClient = nil;
     [parameters addEntriesFromDictionary:self.defaultParameters];
     parameters[FBSnapshotMaxDepthKey] = maxDepth;
   }
-  if ([FBAXClient respondsToSelector:@selector(requestSnapshotForElement:attributes:parameters:error:)]) {
-    id result = [FBAXClient requestSnapshotForElement:element
-                                           attributes:attributes
-                                           parameters:[parameters copy]
-                                                error:error];
-    XCElementSnapshot *snapshot = [result valueForKey:@"_rootElementSnapshot"];
-    return nil == snapshot ? result : snapshot;
-  }
-  return [FBAXClient snapshotForElement:element
-                             attributes:attributes
-                             parameters:[parameters copy]
-                                  error:error];
+
+  id result = [FBAXClient requestSnapshotForElement:element
+                                         attributes:attributes
+                                         parameters:[parameters copy]
+                                              error:error];
+  XCElementSnapshot *snapshot = [result valueForKey:@"_rootElementSnapshot"];
+  return nil == snapshot ? result : snapshot;
 }
 
 - (NSArray<XCAccessibilityElement *> *)activeApplications
@@ -119,27 +110,14 @@ static id FBAXClient = nil;
 - (NSDictionary *)attributesForElement:(XCAccessibilityElement *)element
                             attributes:(NSArray *)attributes
 {
-  if ([FBAXClient respondsToSelector:@selector(attributesForElement:attributes:error:)]) {
-    NSError *error = nil;
-    NSDictionary* result = [FBAXClient attributesForElement:element
-                                                 attributes:attributes
-                                                      error:&error];
-    if (error) {
-      [FBLogger logFmt:@"Cannot retrieve element attribute(s) %@. Original error: %@", attributes, error.description];
-    }
-    return result;
+  NSError *error = nil;
+  NSDictionary* result = [FBAXClient attributesForElement:element
+                                               attributes:attributes
+                                                    error:&error];
+  if (error) {
+    [FBLogger logFmt:@"Cannot retrieve element attribute(s) %@. Original error: %@", attributes, error.description];
   }
-  return [FBAXClient attributesForElement:element attributes:attributes];
-}
-
-- (BOOL)hasProcessTracker
-{
-  static BOOL hasTracker;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    hasTracker = [FBAXClient respondsToSelector:@selector(applicationProcessTracker)];
-  });
-  return hasTracker;
+  return result;
 }
 
 - (XCUIApplication *)monitoredApplicationWithProcessIdentifier:(int)pid

package/WebDriverAgentLib/Utilities/FBXCTestDaemonsProxy.m

@@ -50,12 +50,7 @@ static dispatch_once_t onceTestRunnerDaemonClass;
 
 + (id<XCTestManager_ManagerInterface>)retrieveTestRunnerProxy
 {
-  if ([XCTestDriver respondsToSelector:@selector(sharedTestDriver)] &&
-      [[XCTestDriver sharedTestDriver] respondsToSelector:@selector(managerProxy)]) {
-    return [XCTestDriver sharedTestDriver].managerProxy;
-  } else {
-    return ((XCTRunnerDaemonSession *)[FBXCTRunnerDaemonSessionClass sharedSession]).daemonProxy;
-  }
+  return ((XCTRunnerDaemonSession *)[FBXCTRunnerDaemonSessionClass sharedSession]).daemonProxy;
 }
 
 #if !TARGET_OS_TV
@@ -87,15 +82,9 @@ static dispatch_once_t onceTestRunnerDaemonClass;
       XCEventGeneratorHandler handlerBlock = ^(XCSynthesizedEventRecord *innerRecord, NSError *invokeError) {
         errorHandler(invokeError);
       };
-      if ([XCUIDevice.sharedDevice respondsToSelector:@selector(eventSynthesizer)]) {
-        [[XCUIDevice.sharedDevice eventSynthesizer] synthesizeEvent:record completion:(id)^(BOOL result, NSError *invokeError) {
-          handlerBlock(record, invokeError);
-        }];
-      } else {
-        [[FBXCTRunnerDaemonSessionClass sharedSession] synthesizeEvent:record completion:^(NSError *invokeError){
-          handlerBlock(record, invokeError);
-        }];
-      }
+      [[XCUIDevice.sharedDevice eventSynthesizer] synthesizeEvent:record completion:(id)^(BOOL result, NSError *invokeError) {
+        handlerBlock(record, invokeError);
+      }];
     }
   }];
   return didSucceed;

package/WebDriverAgentLib/Utilities/FBXCodeCompatibility.h

@@ -34,8 +34,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface XCElementSnapshot (FBCompatibility)
 
-- (nullable XCElementSnapshot *)fb_rootElement;
-
 + (nullable SEL)fb_attributesForElementSnapshotKeyPathsSelector;
 
 @end
@@ -93,11 +91,6 @@ extern NSString *const FBApplicationMethodNotSupportedException;
  */
 - (nullable XCElementSnapshot *)fb_uniqueSnapshotWithError:(NSError **)error;
 
-/**
- @returns YES if the element supports unique snapshots retrieval
- */
-- (BOOL)fb_isUniqueSnapshotSupported;
-
 @end
 
 
@@ -110,16 +103,6 @@ extern NSString *const FBApplicationMethodNotSupportedException;
 
 @interface XCUIElement (FBCompatibility)
 
-/**
- Enforces snapshot resolution of the destination element.
- !!! Do not cal this method on Xcode 11 or later due to performance considerations.
- Prefer using fb_takeSnapshot instead.
-
- @param error Contains the actual error if element resolution fails
- @returns YES if the element has been successfully resolved
- */
-- (BOOL)fb_resolveWithError:(NSError **)error;
-
 /**
  Determines whether current iOS SDK supports non modal elements inlusion into snapshots
 

package/WebDriverAgentLib/Utilities/FBXCodeCompatibility.m

@@ -19,21 +19,8 @@
 
 static const NSTimeInterval APP_STATE_CHANGE_TIMEOUT = 5.0;
 
-static BOOL FBShouldUseOldElementRootSelector = NO;
-static dispatch_once_t onceRootElementToken;
 @implementation XCElementSnapshot (FBCompatibility)
 
-- (XCElementSnapshot *)fb_rootElement
-{
-  dispatch_once(&onceRootElementToken, ^{
-    FBShouldUseOldElementRootSelector = [self respondsToSelector:@selector(_rootElement)];
-  });
-  if (FBShouldUseOldElementRootSelector) {
-    return [self _rootElement];
-  }
-  return [self rootElement];
-}
-
 + (id)fb_axAttributesForElementSnapshotKeyPathsIOS:(id)arg1
 {
   return [self.class axAttributesForElementSnapshotKeyPaths:arg1 isMacOS:NO];
@@ -44,9 +31,7 @@ static dispatch_once_t onceRootElementToken;
   static SEL attributesForElementSnapshotKeyPathsSelector = nil;
   static dispatch_once_t attributesForElementSnapshotKeyPathsSelectorToken;
   dispatch_once(&attributesForElementSnapshotKeyPathsSelectorToken, ^{
-    if ([self.class respondsToSelector:@selector(snapshotAttributesForElementSnapshotKeyPaths:)]) {
-      attributesForElementSnapshotKeyPathsSelector = @selector(snapshotAttributesForElementSnapshotKeyPaths:);
-    } else if ([self.class respondsToSelector:@selector(axAttributesForElementSnapshotKeyPaths:)]) {
+    if ([self.class respondsToSelector:@selector(axAttributesForElementSnapshotKeyPaths:)]) {
       attributesForElementSnapshotKeyPathsSelector = @selector(axAttributesForElementSnapshotKeyPaths:);
     } else if ([self.class respondsToSelector:@selector(axAttributesForElementSnapshotKeyPaths:isMacOS:)]) {
       attributesForElementSnapshotKeyPathsSelector = @selector(fb_axAttributesForElementSnapshotKeyPathsIOS:);
@@ -60,22 +45,14 @@ static dispatch_once_t onceRootElementToken;
 
 NSString *const FBApplicationMethodNotSupportedException = @"FBApplicationMethodNotSupportedException";
 
-static BOOL FBShouldUseOldAppWithPIDSelector = NO;
-static dispatch_once_t onceAppWithPIDToken;
 @implementation XCUIApplication (FBCompatibility)
 
 + (instancetype)fb_applicationWithPID:(pid_t)processID
 {
-  dispatch_once(&onceAppWithPIDToken, ^{
-    FBShouldUseOldAppWithPIDSelector = [XCUIApplication respondsToSelector:@selector(appWithPID:)];
-  });
   if (0 == processID) {
     return nil;
   }
 
-  if (FBShouldUseOldAppWithPIDSelector) {
-    return [self appWithPID:processID];
-  }
   return [self applicationWithPID:processID];
 }
 
@@ -105,16 +82,6 @@ static dispatch_once_t onceAppWithPIDToken;
 
 @implementation XCUIElementQuery (FBCompatibility)
 
-- (BOOL)fb_isUniqueSnapshotSupported
-{
-  static dispatch_once_t onceToken;
-  static BOOL isUniqueMatchingSnapshotAvailable;
-  dispatch_once(&onceToken, ^{
-    isUniqueMatchingSnapshotAvailable = [self respondsToSelector:@selector(uniqueMatchingSnapshotWithError:)];
-  });
-  return isUniqueMatchingSnapshotAvailable;
-}
-
 - (XCElementSnapshot *)fb_uniqueSnapshotWithError:(NSError **)error
 {
   return [self uniqueMatchingSnapshotWithError:error];
@@ -140,27 +107,6 @@ static dispatch_once_t onceAppWithPIDToken;
 
 @implementation XCUIElement (FBCompatibility)
 
-- (BOOL)fb_resolveWithError:(NSError **)error
-{
-  @try {
-    // The order here matters
-    if ([self respondsToSelector:@selector(resolveOrRaiseTestFailure)]) {
-      [self resolveOrRaiseTestFailure];
-      return YES;
-    } else if ([self respondsToSelector:@selector(resolve:)]) {
-      return [self resolve:error];
-    } else if ([self respondsToSelector:@selector(resolve)]) {
-      [self resolve];
-      return nil != self.lastSnapshot;
-    }
-  } @catch (NSException *e) {
-    if (nil != e.reason) {
-      return [[FBErrorBuilder.builder withDescription:(NSString *)e.reason] buildError:error];
-    }
-  }
-  return [[FBErrorBuilder.builder withDescription:@"Cannot find a matching method to resolve elements. Please contact Appium developers"] buildError:error];
-}
-
 + (BOOL)fb_supportsNonModalElementsInclusion
 {
   static dispatch_once_t hasIncludingNonModalElements;

package/WebDriverAgentLib/Utilities/FBXMLGenerationOptions.h

@@ -0,0 +1,46 @@
+/**
+ * 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>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FBXMLGenerationOptions : NSObject
+
+/**
+ XML buidling scope. Passing nil means the XML should be built in the default scope,
+ i.e no changes to the original tree structore. If the scope is provided then the resulting
+ XML tree will be put under the root, which name is equal to the given scope value.
+ */
+@property (nonatomic, nullable) NSString *scope;
+/**
+ The list of attribute names to exclude from the resulting document.
+ Passing nil means all the available attributes should be included
+ */
+@property (nonatomic, nullable) NSArray<NSString *> *excludedAttributes;
+
+/**
+ Allows to provide XML scope.
+
+ @param scope See the property description above
+ @return self instance for chaining
+ */
+- (FBXMLGenerationOptions *)withScope:(nullable NSString *)scope;
+
+/**
+ Allows to provide a list of excluded XML attributes.
+
+ @param excludedAttributes See the property description above
+ @return self instance for chaining
+ */
+- (FBXMLGenerationOptions *)withExcludedAttributes:(nullable NSArray<NSString *> *)excludedAttributes;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Utilities/FBXMLGenerationOptions.m

@@ -0,0 +1,26 @@
+/**
+ * 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 "FBXMLGenerationOptions.h"
+
+@implementation FBXMLGenerationOptions
+
+- (FBXMLGenerationOptions *)withScope:(NSString *)scope
+{
+  self.scope = scope;
+  return self;
+}
+
+- (FBXMLGenerationOptions *)withExcludedAttributes:(NSArray<NSString *> *)excludedAttributes
+{
+  self.excludedAttributes = excludedAttributes;
+  return self;
+}
+
+@end