appium-webdriveragent 13.1.0 → 13.1.2

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [13.1.2](https://github.com/appium/WebDriverAgent/compare/v13.1.1...v13.1.2) (2026-05-23)
+
+### Bug Fixes
+
+* Address compilation warnings ([#1143](https://github.com/appium/WebDriverAgent/issues/1143)) ([f1f9976](https://github.com/appium/WebDriverAgent/commit/f1f9976f4a0a0fb8a8aa3ee1f2483b25275600e6))
+
+## [13.1.1](https://github.com/appium/WebDriverAgent/compare/v13.1.0...v13.1.1) (2026-05-22)
+
+### Bug Fixes
+
+* ship Scripts/embed-runner-icon.sh in the npm package ([#1141](https://github.com/appium/WebDriverAgent/issues/1141)) ([17ac1c1](https://github.com/appium/WebDriverAgent/commit/17ac1c16a0890ee0fbfe73504a3ff570dfe1a7bf)), closes [#1138](https://github.com/appium/WebDriverAgent/issues/1138)
+
 ## [13.1.0](https://github.com/appium/WebDriverAgent/compare/v13.0.0...v13.1.0) (2026-05-21)
 
 ### Features

package/Scripts/embed-runner-icon.sh

@@ -0,0 +1,87 @@
+#!/bin/bash
+# Embed the WDA app icon into the wrapping XCTRunner host app so the
+# installed WebDriverAgent shows the Appium logo on the iOS home screen
+# instead of a blank icon.
+#
+# Apple's USES_XCTRUNNER auto-generates a Runner.app around UI-testing
+# .xctest bundles but does not inherit icons from the test bundle's
+# asset catalog. actool produces AppIcon*.png + Assets.car inside
+# PlugIns/<product>.xctest/ where iOS never looks. This script lifts
+# them up to the Runner.app root and patches Info.plist accordingly.
+#
+# Limitations:
+#   - Touches XCTRunner internals; may need updates across Xcode versions.
+#   - iOS only; tvOS uses different "Brand Assets" and is not handled.
+#   - Cloud device farms that re-sign WDA must preserve these changes.
+
+set -euo pipefail
+
+RUNNER_APP="${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}-Runner.app"
+XCTEST="${RUNNER_APP}/PlugIns/${PRODUCT_NAME}.xctest"
+
+if [ ! -d "$RUNNER_APP" ]; then
+    echo "warning: ${PRODUCT_NAME}-Runner.app not found at $RUNNER_APP; skipping icon embed"
+    exit 0
+fi
+
+if [ ! -d "$XCTEST" ]; then
+    echo "warning: ${PRODUCT_NAME}.xctest not found inside Runner.app; skipping icon embed"
+    exit 0
+fi
+
+shopt -s nullglob
+ICONS=("$XCTEST"/AppIcon*.png)
+if [ ${#ICONS[@]} -eq 0 ]; then
+    echo "warning: no compiled AppIcon*.png found inside $XCTEST; skipping icon embed"
+    exit 0
+fi
+
+cp -f "${ICONS[@]}" "$RUNNER_APP/"
+if [ -f "$XCTEST/Assets.car" ]; then
+    cp -f "$XCTEST/Assets.car" "$RUNNER_APP/"
+fi
+
+PLIST="$RUNNER_APP/Info.plist"
+/usr/libexec/PlistBuddy -c "Delete :CFBundleIcons" "$PLIST" 2>/dev/null || true
+/usr/libexec/PlistBuddy -c "Delete :CFBundleIcons~ipad" "$PLIST" 2>/dev/null || true
+
+/usr/libexec/PlistBuddy -c "Add :CFBundleIcons dict" "$PLIST"
+/usr/libexec/PlistBuddy -c "Add :CFBundleIcons:CFBundlePrimaryIcon dict" "$PLIST"
+/usr/libexec/PlistBuddy -c "Add :CFBundleIcons:CFBundlePrimaryIcon:CFBundleIconName string AppIcon" "$PLIST"
+/usr/libexec/PlistBuddy -c "Add :CFBundleIcons:CFBundlePrimaryIcon:CFBundleIconFiles array" "$PLIST"
+/usr/libexec/PlistBuddy -c "Add :CFBundleIcons:CFBundlePrimaryIcon:CFBundleIconFiles:0 string AppIcon60x60" "$PLIST"
+
+/usr/libexec/PlistBuddy -c "Add :CFBundleIcons~ipad dict" "$PLIST"
+/usr/libexec/PlistBuddy -c "Add :CFBundleIcons~ipad:CFBundlePrimaryIcon dict" "$PLIST"
+/usr/libexec/PlistBuddy -c "Add :CFBundleIcons~ipad:CFBundlePrimaryIcon:CFBundleIconName string AppIcon" "$PLIST"
+/usr/libexec/PlistBuddy -c "Add :CFBundleIcons~ipad:CFBundlePrimaryIcon:CFBundleIconFiles array" "$PLIST"
+/usr/libexec/PlistBuddy -c "Add :CFBundleIcons~ipad:CFBundlePrimaryIcon:CFBundleIconFiles:0 string AppIcon60x60" "$PLIST"
+/usr/libexec/PlistBuddy -c "Add :CFBundleIcons~ipad:CFBundlePrimaryIcon:CFBundleIconFiles:1 string AppIcon76x76" "$PLIST"
+
+# Re-codesign since we modified the bundle after Xcode signed it.
+# In a scheme post-action context Xcode's CODE_SIGN_* env vars are not exposed,
+# so discover the existing signing identity from the already-signed bundle.
+if [ -d "$RUNNER_APP/_CodeSignature" ]; then
+    # Capture the signature info once. Piping codesign straight into
+    # `awk ... exit` makes awk close the pipe early, killing codesign with
+    # SIGPIPE -- which `set -o pipefail` turns into a fatal error. That trips
+    # only when an Authority line exists, i.e. on every real-device build.
+    SIGN_INFO=$(codesign -dvv "$RUNNER_APP" 2>&1 || true)
+    EXISTING_IDENT="${EXPANDED_CODE_SIGN_IDENTITY:-}"
+    if [ -z "$EXISTING_IDENT" ]; then
+        EXISTING_IDENT=$(awk -F'=' '/^Authority/ {print $2; exit}' <<< "$SIGN_INFO")
+    fi
+    # Simulator builds are ad-hoc signed: there is no Authority line, but the
+    # bundle can still be re-signed ad-hoc with an identity of "-".
+    if [ -z "$EXISTING_IDENT" ] && grep -q '^Signature=adhoc' <<< "$SIGN_INFO"; then
+        EXISTING_IDENT="-"
+    fi
+    if [ -n "$EXISTING_IDENT" ]; then
+        codesign --force --sign "$EXISTING_IDENT" \
+                 --preserve-metadata=identifier,entitlements "$RUNNER_APP"
+    else
+        echo "warning: bundle is signed but no identity discovered; signature will be invalid"
+    fi
+fi
+
+echo "embedded icon into $RUNNER_APP"

package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m

@@ -232,7 +232,7 @@ static bool fb_isLocked;
   NSString *description = [NSString stringWithFormat:@"Cannot open '%@' with the default application assigned for it. Consider upgrading to Xcode 14.3+/iOS 16.4+", url];
   return [[[FBErrorBuilder builder]
            withDescriptionFormat:@"%@", description]
-          buildError:error];;
+          buildError:error];
 }
 
 - (BOOL)fb_openUrl:(NSString *)url withApplication:(NSString *)bundleId error:(NSError **)error

package/WebDriverAgentLib/Categories/XCUIDevice+FBRotation.m

@@ -30,19 +30,38 @@
   if (keysForRotationObj.count == 0) {
     return NO;
   }
-  NSInteger orientation = keysForRotationObj.firstObject.integerValue;
+  UIDeviceOrientation orientation = (UIDeviceOrientation)keysForRotationObj.firstObject.integerValue;
   XCUIApplication *application = XCUIApplication.fb_activeApplication;
   [XCUIDevice sharedDevice].orientation = orientation;
   return [self waitUntilInterfaceIsAtOrientation:orientation application:application];
 }
 
-- (BOOL)waitUntilInterfaceIsAtOrientation:(NSInteger)orientation application:(XCUIApplication *)application
+static UIInterfaceOrientation FBInterfaceOrientationFromDeviceOrientation(UIDeviceOrientation orientation)
+{
+  switch (orientation) {
+    case UIDeviceOrientationPortrait:
+      return UIInterfaceOrientationPortrait;
+    case UIDeviceOrientationPortraitUpsideDown:
+      return UIInterfaceOrientationPortraitUpsideDown;
+    case UIDeviceOrientationLandscapeLeft:
+      return UIInterfaceOrientationLandscapeRight;
+    case UIDeviceOrientationLandscapeRight:
+      return UIInterfaceOrientationLandscapeLeft;
+    case UIDeviceOrientationUnknown:
+    case UIDeviceOrientationFaceUp:
+    case UIDeviceOrientationFaceDown:
+    default:
+      return UIInterfaceOrientationUnknown;
+  }
+}
+
+- (BOOL)waitUntilInterfaceIsAtOrientation:(UIDeviceOrientation)orientation application:(XCUIApplication *)application
 {
   // Tapping elements immediately after rotation may fail due to way UIKit is handling touches.
   // We should wait till UI cools off, before continuing
   [application fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
 
-  return application.interfaceOrientation == orientation;
+  return application.interfaceOrientation == FBInterfaceOrientationFromDeviceOrientation(orientation);
 }
 
 - (NSDictionary *)fb_rotationMapping

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m

@@ -113,7 +113,7 @@
   XCUIElementType type = XCUIElementTypeAny;
   NSArray<NSNumber *> *uniqueTypes = [snapshots valueForKeyPath:[NSString stringWithFormat:@"@distinctUnionOfObjects.%@", FBStringify(XCUIElement, elementType)]];
   if (uniqueTypes && [uniqueTypes count] == 1) {
-    type = [uniqueTypes.firstObject intValue];
+    type = (XCUIElementType)[uniqueTypes.firstObject intValue];
   }
   XCUIElementQuery *query = onlyChildren
     ? [self.fb_query childrenMatchingType:type]

package/WebDriverAgentLib/Categories/XCUIElement+FBVisibleFrame.m

@@ -29,13 +29,19 @@
 {
   CGRect thisVisibleFrame = [self visibleFrame];
   if (!CGRectIsEmpty(thisVisibleFrame)) {
-    return thisVisibleFrame;
+    return CGRectMake(CGRectGetMinX(thisVisibleFrame),
+                      CGRectGetMinY(thisVisibleFrame),
+                      CGRectGetWidth(thisVisibleFrame),
+                      CGRectGetHeight(thisVisibleFrame));
   }
 
   NSDictionary *visibleFrameDict = [self fb_attributeValue:FB_XCAXAVisibleFrameAttributeName
                                                      error:nil];
   if (nil == visibleFrameDict) {
-    return thisVisibleFrame;
+    return CGRectMake(CGRectGetMinX(thisVisibleFrame),
+                      CGRectGetMinY(thisVisibleFrame),
+                      CGRectGetWidth(thisVisibleFrame),
+                      CGRectGetHeight(thisVisibleFrame));
   }
 
   id x = [visibleFrameDict objectForKey:@"X"];
@@ -46,7 +52,10 @@
     return CGRectMake([x doubleValue], [y doubleValue], [width doubleValue], [height doubleValue]);
   }
 
-  return thisVisibleFrame;
+  return CGRectMake(CGRectGetMinX(thisVisibleFrame),
+                    CGRectGetMinY(thisVisibleFrame),
+                    CGRectGetWidth(thisVisibleFrame),
+                    CGRectGetHeight(thisVisibleFrame));
 }
 
 @end

package/WebDriverAgentLib/Commands/FBCustomCommands.m

@@ -253,7 +253,7 @@
   if (nil == result) {
     return FBResponseWithUnknownError(error);
   }
-  return FBResponseWithObject([result base64EncodedStringWithOptions:0]);
+  return FBResponseWithObject([result base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)0]);
 }
 
 + (id<FBResponsePayload>)handleGetBatteryInfo:(FBRouteRequest *)request
@@ -599,7 +599,7 @@
         modifierFlags = [(NSNumber *)modifiers unsignedIntValue];
       }
       NSString *keyValue = [FBKeyboard keyValueForName:item] ?: key;
-      [destination typeKey:keyValue modifierFlags:modifierFlags];
+      [destination typeKey:keyValue modifierFlags:(XCUIKeyModifierFlags)modifierFlags];
     } else {
       NSString *message = @"All items of the 'keys' array must be either dictionaries or strings";
       return FBResponseWithStatus([FBCommandStatus invalidArgumentErrorWithMessage:message

package/WebDriverAgentLib/Commands/FBElementCommands.m

@@ -574,7 +574,7 @@
                                                                                 traceback:nil]);
       }
     }
-    NSString *screenshot = [screenshotData base64EncodedStringWithOptions:0];
+    NSString *screenshot = [screenshotData base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)0];
     screenshotData = nil;
     return FBResponseWithObject(screenshot);
   }

package/WebDriverAgentLib/Commands/FBOrientationCommands.m

@@ -139,7 +139,7 @@ const struct FBWDOrientationValues FBWDOrientationValues = {
   if (orientationValue == nil) {
     return NO;
   }
-  return [[XCUIDevice sharedDevice] fb_setDeviceInterfaceOrientation:orientationValue.integerValue];
+  return [[XCUIDevice sharedDevice] fb_setDeviceInterfaceOrientation:(UIDeviceOrientation)orientationValue.integerValue];
 }
 
 + (NSDictionary *)_orientationsMapping

package/WebDriverAgentLib/Commands/FBScreenshotCommands.m

@@ -33,7 +33,7 @@
   if (nil == screenshotData) {
     return FBResponseWithStatus([FBCommandStatus unableToCaptureScreenErrorWithMessage:error.description traceback:nil]);
   }
-  NSString *screenshot = [screenshotData base64EncodedStringWithOptions:0];
+  NSString *screenshot = [screenshotData base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)0];
   return FBResponseWithObject(screenshot);
 }
 

package/WebDriverAgentLib/Info.plist

@@ -15,11 +15,11 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>13.1.0</string>
+    <string>13.1.2</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>13.1.0</string>
+    <string>13.1.2</string>
     <key>NSPrincipalClass</key>
     <string/>
   </dict>

package/WebDriverAgentLib/Routing/FBScreenRecordingRequest.m

@@ -46,7 +46,7 @@
   [videoEncodingInitInvocation setSelector:videoEncodingConstructorSelector];
   long long codec = self.codec;
   [videoEncodingInitInvocation setArgument:&codec atIndex:2];
-  double frameRate = self.fps;
+  double frameRate = (double)self.fps;
   [videoEncodingInitInvocation setArgument:&frameRate atIndex:3];
   [videoEncodingInitInvocation invokeWithTarget:videoEncodingAllocated];
   id __unsafe_unretained result;

package/WebDriverAgentLib/Routing/FBTCPSocket.m

@@ -39,7 +39,7 @@
 - (BOOL)startWithError:(NSError **)error
 {
   if (![self.listeningSocket acceptOnPort:self.port error:error]) {
-    return NO;;
+    return NO;
   }
 
   return YES;

package/WebDriverAgentLib/Utilities/FBClassChainQueryParser.m

@@ -117,7 +117,7 @@ NS_ASSUME_NONNULL_END
 {
   NSMutableString *value = [NSMutableString stringWithString:self.asString];
   [value appendFormat:@"%C", character];
-  self.asString = value.copy;;
+  self.asString = value.copy;
 }
 
 - (nullable FBBaseClassChainToken*)followingTokenBasedOn:(unichar)character

package/WebDriverAgentLib/Utilities/FBImageProcessor.m

@@ -25,6 +25,7 @@ const CGFloat FBMaxCompressionQuality = 1.0f;
 @interface FBImageProcessor ()
 
 @property (nonatomic) NSData *nextImage;
+@property (nonatomic) NSMutableArray<void (^)(NSData *)> *pendingCompletionHandlers;
 @property (nonatomic, readonly) NSLock *nextImageLock;
 @property (nonatomic, readonly) dispatch_queue_t scalingQueue;
 @property (atomic, assign) BOOL isScalingScheduled;
@@ -38,6 +39,7 @@ const CGFloat FBMaxCompressionQuality = 1.0f;
   self = [super init];
   if (self) {
     _nextImageLock = [[NSLock alloc] init];
+    _pendingCompletionHandlers = [NSMutableArray array];
     _scalingQueue = dispatch_queue_create("image.scaling.queue", NULL);
     _isScalingScheduled = NO;
   }
@@ -53,6 +55,7 @@ const CGFloat FBMaxCompressionQuality = 1.0f;
     [FBLogger verboseLog:@"Discarding screenshot"];
   }
   self.nextImage = image;
+  [self.pendingCompletionHandlers addObject:[completionHandler copy]];
   BOOL shouldSchedule = !self.isScalingScheduled;
   if (shouldSchedule) {
     self.isScalingScheduled = YES;
@@ -62,14 +65,14 @@ const CGFloat FBMaxCompressionQuality = 1.0f;
     return;
   }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcompletion-handler"
   dispatch_async(self.scalingQueue, ^{
     while (YES) {
       @autoreleasepool {
         [self.nextImageLock lock];
         NSData *nextImageData = self.nextImage;
         self.nextImage = nil;
+        NSArray<void (^)(NSData *)> *handlers = [self.pendingCompletionHandlers copy];
+        [self.pendingCompletionHandlers removeAllObjects];
         if (nextImageData == nil) {
           self.isScalingScheduled = NO;
           [self.nextImageLock unlock];
@@ -80,7 +83,7 @@ const CGFloat FBMaxCompressionQuality = 1.0f;
         // We do not want this value to be too high because then we get images larger in size than original ones
         // Although, we also don't want to lose too much of the quality on recompression
         CGFloat recompressionQuality = MAX(0.9,
-                                           MIN(FBMaxCompressionQuality, FBConfiguration.mjpegServerScreenshotQuality / 100.0));
+                                           MIN(FBMaxCompressionQuality, (double)FBConfiguration.mjpegServerScreenshotQuality / 100.0));
         NSData *thumbnailData = [self.class fixedImageDataWithImageData:nextImageData
                                                           scalingFactor:scalingFactor
                                                                     uti:UTTypeJPEG
@@ -89,11 +92,13 @@ const CGFloat FBMaxCompressionQuality = 1.0f;
         // Use it with care. See https://github.com/appium/WebDriverAgent/pull/812
                                                          fixOrientation:FBConfiguration.mjpegShouldFixOrientation
                                                      desiredOrientation:nil];
-        completionHandler(thumbnailData ?: nextImageData);
+        NSData *processedImageData = thumbnailData ?: nextImageData;
+        for (void (^handler)(NSData *) in handlers) {
+          handler(processedImageData);
+        }
       }
     }
   });
-#pragma clang diagnostic pop
 }
 
 + (nullable NSData *)fixedImageDataWithImageData:(NSData *)imageData

package/WebDriverAgentLib/Utilities/FBMjpegServer.m

@@ -95,7 +95,7 @@ static NSUInteger FBNormalizedMjpegFramerate(NSUInteger framerate)
     return;
   }
   NSUInteger framerate = FBNormalizedMjpegFramerate(FBConfiguration.mjpegServerFramerate);
-  uint64_t timerInterval = (uint64_t)(1.0 / framerate * NSEC_PER_SEC);
+  uint64_t timerInterval = (uint64_t)(1.0 / (double)framerate * NSEC_PER_SEC);
   uint64_t timeStarted = clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW);
   @synchronized (self.listeningClients) {
     if (0 == self.listeningClients.count) {
@@ -106,7 +106,7 @@ static NSUInteger FBNormalizedMjpegFramerate(NSUInteger framerate)
 
   NSError *error;
   CGFloat compressionQuality = MAX(FBMinCompressionQuality,
-                                   MIN(FBMaxCompressionQuality, FBConfiguration.mjpegServerScreenshotQuality / 100.0));
+                                   MIN(FBMaxCompressionQuality, (double)FBConfiguration.mjpegServerScreenshotQuality / 100.0));
   NSData *screenshotData = [FBScreenshot takeInOriginalResolutionWithScreenID:self.mainScreenID
                                                            compressionQuality:compressionQuality
                                                                           uti:UTTypeJPEG

package/WebDriverAgentLib/Utilities/FBScreenshot.m

@@ -126,7 +126,7 @@ NSString *formatTimeInterval(NSTimeInterval interval) {
         withDescription:timeoutMsg]
        buildError:error];
     }
-  };
+  }
   if (nil != error && nil != innerError) {
     *error = innerError;
   }

package/WebDriverAgentLib/Utilities/XCTestPrivateSymbols.h

@@ -50,8 +50,8 @@ extern NSArray<NSNumber *> *(*XCAXAccessibilityAttributesForStringAttributes)(id
  */
 void *FBRetrieveXCTestSymbol(const char *name);
 
-/*! Static constructor that will retrieve XCTest private symbols */
-__attribute__((constructor)) void FBLoadXCTestSymbols(void);
+/*! Loads XCTest private symbols. Safe to call multiple times. */
+void FBLoadXCTestSymbols(void);
 
 /**
  Method is used to tranform attribute names into the format, which

package/WebDriverAgentLib/Utilities/XCTestPrivateSymbols.m

@@ -30,41 +30,56 @@ id<XCDebugLogDelegate> (*XCDebugLogger)(void);
 
 NSArray<NSNumber *> *(*XCAXAccessibilityAttributesForStringAttributes)(id);
 
-__attribute__((constructor)) void FBLoadXCTestSymbols(void)
+@interface FBXCTestSymbolsLoader : NSObject
+@end
+
+@implementation FBXCTestSymbolsLoader
+
++ (void)load
+{
+  FBLoadXCTestSymbols();
+}
+
+@end
+
+void FBLoadXCTestSymbols(void)
 {
-  NSString *XC_kAXXCAttributeIsVisible = *(NSString*__autoreleasing*)FBRetrieveXCTestSymbol([FB_XCAXAIsVisibleAttributeName UTF8String]);
-  NSString *XC_kAXXCAttributeIsElement = *(NSString*__autoreleasing*)FBRetrieveXCTestSymbol([FB_XCAXAIsElementAttributeName UTF8String]);
-
-  XCAXAccessibilityAttributesForStringAttributes =
-  (NSArray<NSNumber *> *(*)(id))FBRetrieveXCTestSymbol("XCAXAccessibilityAttributesForStringAttributes");
-
-  XCSetDebugLogger = (void (*)(id <XCDebugLogDelegate>))FBRetrieveXCTestSymbol("XCSetDebugLogger");
-  XCDebugLogger = (id<XCDebugLogDelegate>(*)(void))FBRetrieveXCTestSymbol("XCDebugLogger");
-
-  NSArray<NSNumber *> *accessibilityAttributes = XCAXAccessibilityAttributesForStringAttributes(@[XC_kAXXCAttributeIsVisible, XC_kAXXCAttributeIsElement]);
-  FB_XCAXAIsVisibleAttribute = accessibilityAttributes[0];
-  FB_XCAXAIsElementAttribute = accessibilityAttributes[1];
-
-  NSCAssert(FB_XCAXAIsVisibleAttribute != nil , @"Failed to retrieve FB_XCAXAIsVisibleAttribute", FB_XCAXAIsVisibleAttribute);
-  NSCAssert(FB_XCAXAIsElementAttribute != nil , @"Failed to retrieve FB_XCAXAIsElementAttribute", FB_XCAXAIsElementAttribute);
-  
-  NSString *XC_kAXXCAttributeMinValue = *(NSString *__autoreleasing *)FBRetrieveXCTestSymbol([FB_XCAXACustomMinValueAttributeName UTF8String]);
-  NSString *XC_kAXXCAttributeMaxValue = *(NSString *__autoreleasing *)FBRetrieveXCTestSymbol([FB_XCAXACustomMaxValueAttributeName UTF8String]);
-  
-  NSString *XC_kAXXCAttributeCustomActions = *(NSString *__autoreleasing *)FBRetrieveXCTestSymbol([FB_XCAXACustomActionsAttributeName UTF8String]);
-  
-  NSArray<NSNumber *> *customAttrs = XCAXAccessibilityAttributesForStringAttributes(@[
-    XC_kAXXCAttributeMinValue,
-    XC_kAXXCAttributeMaxValue,
-    XC_kAXXCAttributeCustomActions
-  ]);
-  FB_XCAXACustomMinValueAttribute = customAttrs[0];
-  FB_XCAXACustomMaxValueAttribute = customAttrs[1];
-  FB_XCAXACustomActionsAttribute = customAttrs[2];
-  
-  NSCAssert(FB_XCAXACustomMinValueAttribute != nil, @"Failed to retrieve FB_XCAXACustomMinValueAttribute", FB_XCAXACustomMinValueAttribute);
-  NSCAssert(FB_XCAXACustomMaxValueAttribute != nil, @"Failed to retrieve FB_XCAXACustomMaxValueAttribute", FB_XCAXACustomMaxValueAttribute);
-  NSCAssert(FB_XCAXACustomActionsAttribute != nil, @"Failed to retrieve FB_XCAXACustomActionsAttribute", FB_XCAXACustomActionsAttribute);
+  static dispatch_once_t loadOnceToken;
+  dispatch_once(&loadOnceToken, ^{
+    NSString *XC_kAXXCAttributeIsVisible = *(NSString*__autoreleasing*)FBRetrieveXCTestSymbol([FB_XCAXAIsVisibleAttributeName UTF8String]);
+    NSString *XC_kAXXCAttributeIsElement = *(NSString*__autoreleasing*)FBRetrieveXCTestSymbol([FB_XCAXAIsElementAttributeName UTF8String]);
+
+    XCAXAccessibilityAttributesForStringAttributes =
+    (NSArray<NSNumber *> *(*)(id))FBRetrieveXCTestSymbol("XCAXAccessibilityAttributesForStringAttributes");
+
+    XCSetDebugLogger = (void (*)(id <XCDebugLogDelegate>))FBRetrieveXCTestSymbol("XCSetDebugLogger");
+    XCDebugLogger = (id<XCDebugLogDelegate>(*)(void))FBRetrieveXCTestSymbol("XCDebugLogger");
+
+    NSArray<NSNumber *> *accessibilityAttributes = XCAXAccessibilityAttributesForStringAttributes(@[XC_kAXXCAttributeIsVisible, XC_kAXXCAttributeIsElement]);
+    FB_XCAXAIsVisibleAttribute = accessibilityAttributes[0];
+    FB_XCAXAIsElementAttribute = accessibilityAttributes[1];
+
+    NSCAssert(FB_XCAXAIsVisibleAttribute != nil , @"Failed to retrieve FB_XCAXAIsVisibleAttribute", FB_XCAXAIsVisibleAttribute);
+    NSCAssert(FB_XCAXAIsElementAttribute != nil , @"Failed to retrieve FB_XCAXAIsElementAttribute", FB_XCAXAIsElementAttribute);
+
+    NSString *XC_kAXXCAttributeMinValue = *(NSString *__autoreleasing *)FBRetrieveXCTestSymbol([FB_XCAXACustomMinValueAttributeName UTF8String]);
+    NSString *XC_kAXXCAttributeMaxValue = *(NSString *__autoreleasing *)FBRetrieveXCTestSymbol([FB_XCAXACustomMaxValueAttributeName UTF8String]);
+
+    NSString *XC_kAXXCAttributeCustomActions = *(NSString *__autoreleasing *)FBRetrieveXCTestSymbol([FB_XCAXACustomActionsAttributeName UTF8String]);
+
+    NSArray<NSNumber *> *customAttrs = XCAXAccessibilityAttributesForStringAttributes(@[
+      XC_kAXXCAttributeMinValue,
+      XC_kAXXCAttributeMaxValue,
+      XC_kAXXCAttributeCustomActions
+    ]);
+    FB_XCAXACustomMinValueAttribute = customAttrs[0];
+    FB_XCAXACustomMaxValueAttribute = customAttrs[1];
+    FB_XCAXACustomActionsAttribute = customAttrs[2];
+
+    NSCAssert(FB_XCAXACustomMinValueAttribute != nil, @"Failed to retrieve FB_XCAXACustomMinValueAttribute", FB_XCAXACustomMinValueAttribute);
+    NSCAssert(FB_XCAXACustomMaxValueAttribute != nil, @"Failed to retrieve FB_XCAXACustomMaxValueAttribute", FB_XCAXACustomMaxValueAttribute);
+    NSCAssert(FB_XCAXACustomActionsAttribute != nil, @"Failed to retrieve FB_XCAXACustomActionsAttribute", FB_XCAXACustomActionsAttribute);
+  });
 }
 
 void *FBRetrieveXCTestSymbol(const char *name)

package/WebDriverAgentLib/Vendor/CocoaAsyncSocket/GCDAsyncSocket.m

@@ -92,18 +92,18 @@ static const int logLevel = GCDAsyncSocketLogLevel;
 
 // Logging Disabled
 
-#define LogError(frmt, ...)     {}
-#define LogWarn(frmt, ...)      {}
-#define LogInfo(frmt, ...)      {}
-#define LogVerbose(frmt, ...)   {}
+#define LogError(frmt, ...)     do {} while (0)
+#define LogWarn(frmt, ...)      do {} while (0)
+#define LogInfo(frmt, ...)      do {} while (0)
+#define LogVerbose(frmt, ...)   do {} while (0)
 
-#define LogCError(frmt, ...)    {}
-#define LogCWarn(frmt, ...)     {}
-#define LogCInfo(frmt, ...)     {}
-#define LogCVerbose(frmt, ...)  {}
+#define LogCError(frmt, ...)    do {} while (0)
+#define LogCWarn(frmt, ...)     do {} while (0)
+#define LogCInfo(frmt, ...)     do {} while (0)
+#define LogCVerbose(frmt, ...)  do {} while (0)
 
-#define LogTrace()              {}
-#define LogCTrace(frmt, ...)    {}
+#define LogTrace()              do {} while (0)
+#define LogCTrace(frmt, ...)    do {} while (0)
 
 #endif
 
@@ -251,7 +251,7 @@ static dispatch_queue_t cfstreamThreadSetupQueue; // setup & teardown
   if ((self = [super init]))
   {
     preBufferSize = numBytes;
-    preBuffer = malloc(preBufferSize);
+    preBuffer = (uint8_t *)malloc(preBufferSize);
 
     readPointer = preBuffer;
     writePointer = preBuffer;
@@ -274,7 +274,7 @@ static dispatch_queue_t cfstreamThreadSetupQueue; // setup & teardown
     size_t additionalBytes = numBytes - availableSpace;
 
     size_t newPreBufferSize = preBufferSize + additionalBytes;
-    uint8_t *newPreBuffer = realloc(preBuffer, newPreBufferSize);
+    uint8_t *newPreBuffer = (uint8_t *)realloc(preBuffer, newPreBufferSize);
 
     size_t readPointerOffset = readPointer - preBuffer;
     size_t writePointerOffset = writePointer - preBuffer;
@@ -794,7 +794,7 @@ static dispatch_queue_t cfstreamThreadSetupQueue; // setup & teardown
   // The implementation of this method is very similar to the above method.
   // See the above method for a discussion of the algorithm used here.
 
-  uint8_t *buff = [buffer mutableBytes];
+  uint8_t *buff = (uint8_t *)[buffer mutableBytes];
   NSUInteger buffLength = bytesDone + numBytes;
 
   const void *termBuff = [term bytes];
@@ -8693,7 +8693,7 @@ static void CFWriteStreamCallback (CFWriteStreamRef stream,
 {
   if ([address length] >= sizeof(struct sockaddr))
   {
-    const struct sockaddr *sockaddrX = [address bytes];
+    const struct sockaddr *sockaddrX = (const struct sockaddr *)(const void *)[address bytes];
 
     if (sockaddrX->sa_family == AF_INET) {
       return YES;
@@ -8707,7 +8707,7 @@ static void CFWriteStreamCallback (CFWriteStreamRef stream,
 {
   if ([address length] >= sizeof(struct sockaddr))
   {
-    const struct sockaddr *sockaddrX = [address bytes];
+    const struct sockaddr *sockaddrX = (const struct sockaddr *)(const void *)[address bytes];
 
     if (sockaddrX->sa_family == AF_INET6) {
       return YES;
@@ -8726,7 +8726,7 @@ static void CFWriteStreamCallback (CFWriteStreamRef stream,
 {
   if ([address length] >= sizeof(struct sockaddr))
   {
-    const struct sockaddr *sockaddrX = [address bytes];
+    const struct sockaddr *sockaddrX = (const struct sockaddr *)(const void *)[address bytes];
 
     if (sockaddrX->sa_family == AF_INET)
     {

package/WebDriverAgentLib/Vendor/CocoaAsyncSocket/GCDAsyncUdpSocket.m

@@ -70,18 +70,18 @@ static const int logLevel = LOG_LEVEL_VERBOSE;
 
 // Logging Disabled
 
-#define LogError(frmt, ...)     {}
-#define LogWarn(frmt, ...)      {}
-#define LogInfo(frmt, ...)      {}
-#define LogVerbose(frmt, ...)   {}
+#define LogError(frmt, ...)     do {} while (0)
+#define LogWarn(frmt, ...)      do {} while (0)
+#define LogInfo(frmt, ...)      do {} while (0)
+#define LogVerbose(frmt, ...)   do {} while (0)
 
-#define LogCError(frmt, ...)    {}
-#define LogCWarn(frmt, ...)     {}
-#define LogCInfo(frmt, ...)     {}
-#define LogCVerbose(frmt, ...)  {}
+#define LogCError(frmt, ...)    do {} while (0)
+#define LogCWarn(frmt, ...)     do {} while (0)
+#define LogCInfo(frmt, ...)     do {} while (0)
+#define LogCVerbose(frmt, ...)  do {} while (0)
 
-#define LogTrace()              {}
-#define LogCTrace(frmt, ...)    {}
+#define LogTrace()              do {} while (0)
+#define LogCTrace(frmt, ...)    do {} while (0)
 
 #endif
 
@@ -4310,12 +4310,12 @@ enum GCDAsyncUdpSocketConfig
 
     if (currentSend->addressFamily == AF_INET)
     {
-      result = sendto(socket4FD, buffer, length, 0, dst, dstSize);
+      result = sendto(socket4FD, buffer, length, 0, (const struct sockaddr *)dst, dstSize);
       LogVerbose(@"sendto(socket4FD) = %d", result);
     }
     else
     {
-      result = sendto(socket6FD, buffer, length, 0, dst, dstSize);
+      result = sendto(socket6FD, buffer, length, 0, (const struct sockaddr *)dst, dstSize);
       LogVerbose(@"sendto(socket6FD) = %d", result);
     }
   }

package/WebDriverAgentLib/Vendor/CocoaHTTPServer/Categories/DDRange.m

@@ -5,27 +5,21 @@
 
 DDRange DDUnionRange(DDRange range1, DDRange range2)
 {
-  DDRange result;
-  
-  result.location = MIN(range1.location, range2.location);
-  result.length   = MAX(DDMaxRange(range1), DDMaxRange(range2)) - result.location;
-  
-  return result;
+  UInt64 location = MIN(range1.location, range2.location);
+  UInt64 length = MAX(DDMaxRange(range1), DDMaxRange(range2)) - location;
+
+  return DDMakeRange(location, length);
 }
 
 DDRange DDIntersectionRange(DDRange range1, DDRange range2)
 {
-  DDRange result;
-  
   if((DDMaxRange(range1) < range2.location) || (DDMaxRange(range2) < range1.location))
   {
     return DDMakeRange(0, 0);
   }
   
-  result.location = MAX(range1.location, range2.location);
-  result.length   = MIN(DDMaxRange(range1), DDMaxRange(range2)) - result.location;
-  
-  return result;
+  return DDMakeRange(MAX(range1.location, range2.location),
+                   MIN(DDMaxRange(range1), DDMaxRange(range2)) - MAX(range1.location, range2.location));
 }
 
 NSString *DDStringFromRange(DDRange range)

package/WebDriverAgentLib/Vendor/CocoaHTTPServer/HTTPLogging.h

@@ -95,28 +95,28 @@
 
 // Define logging primitives.
 
-#define HTTPLogError(...) { }
+#define HTTPLogError(...) do {} while (0)
 
-#define HTTPLogWarn(...) { }
+#define HTTPLogWarn(...) do {} while (0)
 
-#define HTTPLogInfo(...) { }
+#define HTTPLogInfo(...) do {} while (0)
 
-#define HTTPLogVerbose(...) { }
+#define HTTPLogVerbose(...) do {} while (0)
 
-#define HTTPLogTrace() { }
+#define HTTPLogTrace() do {} while (0)
 
-#define HTTPLogTrace2(...) { }
+#define HTTPLogTrace2(...) do {} while (0)
 
 
-#define HTTPLogCError(...) { }
+#define HTTPLogCError(...) do {} while (0)
 
-#define HTTPLogCWarn(...) { }
+#define HTTPLogCWarn(...) do {} while (0)
 
-#define HTTPLogCInfo(...) { }
+#define HTTPLogCInfo(...) do {} while (0)
 
-#define HTTPLogCVerbose(...) { }
+#define HTTPLogCVerbose(...) do {} while (0)
 
-#define HTTPLogCTrace() { }
+#define HTTPLogCTrace() do {} while (0)
 
-#define HTTPLogCTrace2(...) { }
+#define HTTPLogCTrace2(...) do {} while (0)
 

package/WebDriverAgentLib/Vendor/CocoaHTTPServer/HTTPMessage.m

@@ -68,13 +68,13 @@
   {
     // Look for the end of headers (CRLF CRLF or LF LF)
     NSData *headerEndMarker = [@"\r\n\r\n" dataUsingEncoding:NSASCIIStringEncoding];
-    NSRange headerEndRange = [_rawData rangeOfData:headerEndMarker options:0 range:NSMakeRange(0, [_rawData length])];
+    NSRange headerEndRange = [_rawData rangeOfData:headerEndMarker options:(NSDataSearchOptions)0 range:NSMakeRange(0, [_rawData length])];
 
     if (headerEndRange.location == NSNotFound)
     {
       // Also check for LF LF (some clients use this)
       NSData *lfMarker = [@"\n\n" dataUsingEncoding:NSASCIIStringEncoding];
-      headerEndRange = [_rawData rangeOfData:lfMarker options:0 range:NSMakeRange(0, [_rawData length])];
+      headerEndRange = [_rawData rangeOfData:lfMarker options:(NSDataSearchOptions)0 range:NSMakeRange(0, [_rawData length])];
     }
 
     if (headerEndRange.location != NSNotFound)

package/WebDriverAgentLib/Vendor/RoutingHTTPServer/RoutingHTTPServer.m

@@ -149,16 +149,16 @@
     NSRegularExpression *regex = nil;
     
     // Escape regex characters
-    regex = [NSRegularExpression regularExpressionWithPattern:@"[.+()]" options:0 error:nil];
-    path = [regex stringByReplacingMatchesInString:path options:0 range:NSMakeRange(0, path.length) withTemplate:@"\\\\$0"];
+    regex = [NSRegularExpression regularExpressionWithPattern:@"[.+()]" options:(NSRegularExpressionOptions)0 error:nil];
+    path = [regex stringByReplacingMatchesInString:path options:(NSMatchingOptions)0 range:NSMakeRange(0, path.length) withTemplate:@"\\\\$0"];
     
     // Parse any :parameters and * in the path
     regex = [NSRegularExpression regularExpressionWithPattern:@"(:(\\w+)|\\*)"
-                                                      options:0
+                                                      options:(NSRegularExpressionOptions)0
                                                         error:nil];
     NSMutableString *regexPath = [NSMutableString stringWithString:path];
     __block NSInteger diff = 0;
-    [regex enumerateMatchesInString:path options:0 range:NSMakeRange(0, path.length)
+    [regex enumerateMatchesInString:path options:(NSMatchingOptions)0 range:NSMakeRange(0, path.length)
                          usingBlock:^(NSTextCheckingResult *result, NSMatchingFlags flags, BOOL *stop) {
       NSRange replacementRange = NSMakeRange(diff + result.range.location, result.range.length);
       NSString *replacementString;
@@ -219,7 +219,7 @@
     return nil;
   
   for (Route *route in methodRoutes) {
-    NSTextCheckingResult *result = [route.regex firstMatchInString:path options:0 range:NSMakeRange(0, path.length)];
+    NSTextCheckingResult *result = [route.regex firstMatchInString:path options:(NSMatchingOptions)0 range:NSMakeRange(0, path.length)];
     if (!result)
       continue;
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "13.1.0",
+  "version": "13.1.2",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/lib/index.js",
   "types": "./build/lib/index.d.ts",
@@ -88,6 +88,7 @@
     "lib",
     "build/lib",
     "Scripts/build.sh",
+    "Scripts/embed-runner-icon.sh",
     "Scripts/*.mjs",
     "Configurations",
     "PrivateHeaders",