From aa7a395e9915822d7702797a13e8ac42337c8e76 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 24 Sep 2023 08:32:46 +0000 Subject: [PATCH 1/9] ci: use xcode 15 --- .github/workflows/publish.js.yml | 2 +- .github/workflows/wda-package.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.js.yml b/.github/workflows/publish.js.yml index 6cd3a0276..7615ea350 100644 --- a/.github/workflows/publish.js.yml +++ b/.github/workflows/publish.js.yml @@ -13,7 +13,7 @@ jobs: runs-on: macos-13 env: - XCODE_VERSION: 14.3.1 + XCODE_VERSION: 15.0 ZIP_PKG_NAME_IOS: "WebDriverAgentRunner-Runner.zip" PKG_PATH_IOS: "appium_wda_ios" ZIP_PKG_NAME_TVOS: "WebDriverAgentRunner_tvOS-Runner.zip" diff --git a/.github/workflows/wda-package.yml b/.github/workflows/wda-package.yml index b4b4223f2..f7a2ff3be 100644 --- a/.github/workflows/wda-package.yml +++ b/.github/workflows/wda-package.yml @@ -9,7 +9,7 @@ on: env: HOST: macos-13 - XCODE_VERSION: 14.3.1 + XCODE_VERSION: 15.0 DESTINATION_SIM: platform=iOS Simulator,name=iPhone 14 Pro DESTINATION_SIM_tvOS: platform=tvOS Simulator,name=Apple TV From d39db74f958ae9617bc0e0f46f3ffcc3d81a5b64 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 24 Sep 2023 08:56:46 +0000 Subject: [PATCH 2/9] Remove embedded frameworks --- .github/workflows/publish.js.yml | 14 +++++++++++++- Scripts/ci/build-real.sh | 9 +++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.js.yml b/.github/workflows/publish.js.yml index 7615ea350..e617db908 100644 --- a/.github/workflows/publish.js.yml +++ b/.github/workflows/publish.js.yml @@ -44,9 +44,15 @@ jobs: -scheme WebDriverAgentRunner \ -destination generic/platform=iOS \ CODE_SIGNING_ALLOWED=NO ARCHS=arm64 - - name: Creating a zip of WebDriverAgentRunner-Runner.app for iOS + - name: Creating a zip of WebDriverAgentRunner-Runner.app for iOS after removing test frameworks run: | pushd appium_wda_ios/Build/Products/Debug-iphoneos + rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCTAutomationSupport.framework + rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCTest.framework + rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCTestCore.framework + rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCTestSupport.framework + rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCUIAutomation.framework + rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCUnit.framework zip -r $ZIP_PKG_NAME_IOS WebDriverAgentRunner-Runner.app popd mv $PKG_PATH_IOS/Build/Products/Debug-iphoneos/$ZIP_PKG_NAME_IOS ./ @@ -61,6 +67,12 @@ jobs: - name: Creating a zip of WebDriverAgentRunner-Runner.app for tvOS run: | pushd appium_wda_tvos/Build/Products/Debug-appletvos + rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCTAutomationSupport.framework + rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCTest.framework + rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCTestCore.framework + rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCTestSupport.framework + rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCUIAutomation.framework + rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCUnit.framework zip -r $ZIP_PKG_NAME_TVOS WebDriverAgentRunner_tvOS-Runner.app popd mv $PKG_PATH_TVOS/Build/Products/Debug-appletvos/$ZIP_PKG_NAME_TVOS ./ diff --git a/Scripts/ci/build-real.sh b/Scripts/ci/build-real.sh index 9303ffe3b..2cfa29794 100755 --- a/Scripts/ci/build-real.sh +++ b/Scripts/ci/build-real.sh @@ -12,6 +12,15 @@ xcodebuild clean build-for-testing \ # Only .app is needed. pushd $WD + +# to remove test packages to refer to the device local instead of embedded ones +rm -rf $SCHEME-Runner.app/Frameworks/XCTAutomationSupport.framework +rm -rf $SCHEME-Runner.app/Frameworks/XCTest.framework +rm -rf $SCHEME-Runner.app/Frameworks/XCTestCore.framework +rm -rf $SCHEME-Runner.app/Frameworks/XCTestSupport.framework +rm -rf $SCHEME-Runner.app/Frameworks/XCUIAutomation.framework +rm -rf $SCHEME-Runner.app/Frameworks/XCUnit.framework + zip -r $ZIP_PKG_NAME $SCHEME-Runner.app popd mv $WD/$ZIP_PKG_NAME ./ From 70d9a7822397d76ee5b2dc6c18e53bea3ddd528f Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 24 Sep 2023 09:28:26 -0700 Subject: [PATCH 3/9] Update wda-package.yml --- .github/workflows/wda-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wda-package.yml b/.github/workflows/wda-package.yml index f7a2ff3be..61b5fe531 100644 --- a/.github/workflows/wda-package.yml +++ b/.github/workflows/wda-package.yml @@ -9,7 +9,7 @@ on: env: HOST: macos-13 - XCODE_VERSION: 15.0 + XCODE_VERSION: 15.0.0 DESTINATION_SIM: platform=iOS Simulator,name=iPhone 14 Pro DESTINATION_SIM_tvOS: platform=tvOS Simulator,name=Apple TV From b28f7be2f190e3ce963d33125e2c5e9dcedcd101 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 24 Sep 2023 09:42:04 -0700 Subject: [PATCH 4/9] tweak --- .github/workflows/publish.js.yml | 18 ++++-------------- .github/workflows/wda-package.yml | 2 +- Scripts/ci/build-real.sh | 9 +++------ 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/.github/workflows/publish.js.yml b/.github/workflows/publish.js.yml index e617db908..948a05d3e 100644 --- a/.github/workflows/publish.js.yml +++ b/.github/workflows/publish.js.yml @@ -13,7 +13,7 @@ jobs: runs-on: macos-13 env: - XCODE_VERSION: 15.0 + XCODE_VERSION: "15.0" ZIP_PKG_NAME_IOS: "WebDriverAgentRunner-Runner.zip" PKG_PATH_IOS: "appium_wda_ios" ZIP_PKG_NAME_TVOS: "WebDriverAgentRunner_tvOS-Runner.zip" @@ -47,12 +47,7 @@ jobs: - name: Creating a zip of WebDriverAgentRunner-Runner.app for iOS after removing test frameworks run: | pushd appium_wda_ios/Build/Products/Debug-iphoneos - rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCTAutomationSupport.framework - rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCTest.framework - rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCTestCore.framework - rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCTestSupport.framework - rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCUIAutomation.framework - rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCUnit.framework + rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCT*.framework zip -r $ZIP_PKG_NAME_IOS WebDriverAgentRunner-Runner.app popd mv $PKG_PATH_IOS/Build/Products/Debug-iphoneos/$ZIP_PKG_NAME_IOS ./ @@ -64,15 +59,10 @@ jobs: -scheme WebDriverAgentRunner_tvOS \ -destination generic/platform=tvOS \ CODE_SIGNING_ALLOWED=NO ARCHS=arm64 - - name: Creating a zip of WebDriverAgentRunner-Runner.app for tvOS + - name: Creating a zip of WebDriverAgentRunner-Runner.app for tvOS after removing test frameworks run: | pushd appium_wda_tvos/Build/Products/Debug-appletvos - rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCTAutomationSupport.framework - rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCTest.framework - rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCTestCore.framework - rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCTestSupport.framework - rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCUIAutomation.framework - rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCUnit.framework + rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCT*.framework zip -r $ZIP_PKG_NAME_TVOS WebDriverAgentRunner_tvOS-Runner.app popd mv $PKG_PATH_TVOS/Build/Products/Debug-appletvos/$ZIP_PKG_NAME_TVOS ./ diff --git a/.github/workflows/wda-package.yml b/.github/workflows/wda-package.yml index 61b5fe531..dc7363c6d 100644 --- a/.github/workflows/wda-package.yml +++ b/.github/workflows/wda-package.yml @@ -9,7 +9,7 @@ on: env: HOST: macos-13 - XCODE_VERSION: 15.0.0 + XCODE_VERSION: "15.0" DESTINATION_SIM: platform=iOS Simulator,name=iPhone 14 Pro DESTINATION_SIM_tvOS: platform=tvOS Simulator,name=Apple TV diff --git a/Scripts/ci/build-real.sh b/Scripts/ci/build-real.sh index 2cfa29794..93eec1145 100755 --- a/Scripts/ci/build-real.sh +++ b/Scripts/ci/build-real.sh @@ -14,12 +14,9 @@ xcodebuild clean build-for-testing \ pushd $WD # to remove test packages to refer to the device local instead of embedded ones -rm -rf $SCHEME-Runner.app/Frameworks/XCTAutomationSupport.framework -rm -rf $SCHEME-Runner.app/Frameworks/XCTest.framework -rm -rf $SCHEME-Runner.app/Frameworks/XCTestCore.framework -rm -rf $SCHEME-Runner.app/Frameworks/XCTestSupport.framework -rm -rf $SCHEME-Runner.app/Frameworks/XCUIAutomation.framework -rm -rf $SCHEME-Runner.app/Frameworks/XCUnit.framework +# XCTAutomationSupport.framework, XCTest.framewor, XCTestCore.framework, +# XCUIAutomation.framework, XCUnit.framework +rm -rf $SCHEME-Runner.app/Frameworks/XC*.framework zip -r $ZIP_PKG_NAME $SCHEME-Runner.app popd From 3b5b55ed989a4cbdc1ba0fb1c4c75cb782c14cc5 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 24 Sep 2023 17:32:57 +0000 Subject: [PATCH 5/9] keep using 14.3.1 --- .github/workflows/publish.js.yml | 2 +- .github/workflows/wda-package.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.js.yml b/.github/workflows/publish.js.yml index 948a05d3e..a2b46c405 100644 --- a/.github/workflows/publish.js.yml +++ b/.github/workflows/publish.js.yml @@ -13,7 +13,7 @@ jobs: runs-on: macos-13 env: - XCODE_VERSION: "15.0" + XCODE_VERSION: 14.3.1 ZIP_PKG_NAME_IOS: "WebDriverAgentRunner-Runner.zip" PKG_PATH_IOS: "appium_wda_ios" ZIP_PKG_NAME_TVOS: "WebDriverAgentRunner_tvOS-Runner.zip" diff --git a/.github/workflows/wda-package.yml b/.github/workflows/wda-package.yml index dc7363c6d..b4b4223f2 100644 --- a/.github/workflows/wda-package.yml +++ b/.github/workflows/wda-package.yml @@ -9,7 +9,7 @@ on: env: HOST: macos-13 - XCODE_VERSION: "15.0" + XCODE_VERSION: 14.3.1 DESTINATION_SIM: platform=iOS Simulator,name=iPhone 14 Pro DESTINATION_SIM_tvOS: platform=tvOS Simulator,name=Apple TV From 81629acc9f1c7687676978e26ed3c63fe645d0b8 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 24 Sep 2023 10:37:41 -0700 Subject: [PATCH 6/9] explicitly set ENABLE_TESTING_SEARCH_PATHS as YES --- WebDriverAgent.xcodeproj/project.pbxproj | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/WebDriverAgent.xcodeproj/project.pbxproj b/WebDriverAgent.xcodeproj/project.pbxproj index a5b933127..7a1a368e2 100644 --- a/WebDriverAgent.xcodeproj/project.pbxproj +++ b/WebDriverAgent.xcodeproj/project.pbxproj @@ -2414,7 +2414,6 @@ 641EE6C02240C5CA00173FCB /* XCUIApplication+FBHelpers.h in Headers */, 641EE6C12240C5CA00173FCB /* _XCTestObservationCenterImplementation.h in Headers */, 714EAA0E2673FDFE005C5B47 /* FBCapabilities.h in Headers */, - 716F0DA22A16CA1000CDD977 /* NSDictionary+FBUtf8SafeDictionary.h in Headers */, 641EE6C22240C5CA00173FCB /* XCUIDevice+FBHelpers.h in Headers */, 71D3B3D6267FC7260076473D /* XCUIElement+FBResolve.h in Headers */, 641EE6C32240C5CA00173FCB /* FBClassChainQueryParser.h in Headers */, @@ -3117,7 +3116,6 @@ 641EE5FF2240C5CA00173FCB /* XCUIElement+FBForceTouch.m in Sources */, 716C9E0327315EFF005AD475 /* XCUIApplication+FBUIInterruptions.m in Sources */, 641EE6002240C5CA00173FCB /* FBTouchActionCommands.m in Sources */, - 716F0DA42A16CA1000CDD977 /* NSDictionary+FBUtf8SafeDictionary.m in Sources */, 719DCF182601EAFB000E765F /* FBNotificationsHelper.m in Sources */, 714EAA102673FDFE005C5B47 /* FBCapabilities.m in Sources */, 641EE6012240C5CA00173FCB /* FBImageIOScaler.m in Sources */, @@ -3172,7 +3170,6 @@ buildActionMask = 2147483647; files = ( 64B26508228C5514002A5025 /* XCUIElementDouble.m in Sources */, - 716F0DA72A17323300CDD977 /* NSDictionaryFBUtf8SafeTests.m in Sources */, 64B26504228C5299002A5025 /* FBTVNavigationTrackerTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3496,6 +3493,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = "iPhone Developer"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_TESTING_SEARCH_PATHS = YES; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = WebDriverAgentRunner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -3551,6 +3549,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = "iPhone Developer"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_TESTING_SEARCH_PATHS = YES; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = WebDriverAgentRunner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -3603,6 +3602,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_TESTING_SEARCH_PATHS = YES; FRAMEWORK_SEARCH_PATHS = ( "$(PLATFORM_DIR)/Developer/Library/Frameworks", "$(PLATFORM_DIR)/Developer/Library/PrivateFrameworks", @@ -3664,6 +3664,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_TESTING_SEARCH_PATHS = YES; FRAMEWORK_SEARCH_PATHS = ( "$(PLATFORM_DIR)/Developer/Library/Frameworks", "$(PLATFORM_DIR)/Developer/Library/PrivateFrameworks", @@ -3915,6 +3916,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_TESTING_SEARCH_PATHS = YES; FRAMEWORK_SEARCH_PATHS = ( "$(PLATFORM_DIR)/Developer/Library/Frameworks", "$(PLATFORM_DIR)/Developer/Library/PrivateFrameworks", @@ -3974,6 +3976,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_TESTING_SEARCH_PATHS = YES; FRAMEWORK_SEARCH_PATHS = ( "$(PLATFORM_DIR)/Developer/Library/Frameworks", "$(PLATFORM_DIR)/Developer/Library/PrivateFrameworks", @@ -4212,6 +4215,7 @@ buildSettings = { CLANG_STATIC_ANALYZER_MODE = deep; DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_TESTING_SEARCH_PATHS = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = WebDriverAgentRunner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -4259,6 +4263,7 @@ baseConfigurationReference = EEE5CABF1C80361500CBBDD9 /* IOSSettings.xcconfig */; buildSettings = { CLANG_STATIC_ANALYZER_MODE = deep; + ENABLE_TESTING_SEARCH_PATHS = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = WebDriverAgentRunner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( From 98754a37e879c416410511599e234e6d08298182 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 24 Sep 2023 11:25:57 -0700 Subject: [PATCH 7/9] add system reference --- WebDriverAgent.xcodeproj/project.pbxproj | 32 ++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/WebDriverAgent.xcodeproj/project.pbxproj b/WebDriverAgent.xcodeproj/project.pbxproj index 7a1a368e2..4fad9a131 100644 --- a/WebDriverAgent.xcodeproj/project.pbxproj +++ b/WebDriverAgent.xcodeproj/project.pbxproj @@ -3500,6 +3500,10 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + /System/Developer/Library/Frameworks, + /System/Developer/Library/PrivateFrameworks, + /Developer/Library/PrivateFrameworks, + /Developer/Library/Frameworks, ); MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -3556,6 +3560,10 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + /System/Developer/Library/Frameworks, + /System/Developer/Library/PrivateFrameworks, + /Developer/Library/PrivateFrameworks, + /Developer/Library/Frameworks, ); MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -3614,6 +3622,10 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + /System/Developer/Library/Frameworks, + /System/Developer/Library/PrivateFrameworks, + /Developer/Library/PrivateFrameworks, + /Developer/Library/Frameworks, ); OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.facebook.WebDriverAgentLib; @@ -3676,6 +3688,10 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + /System/Developer/Library/Frameworks, + /System/Developer/Library/PrivateFrameworks, + /Developer/Library/PrivateFrameworks, + /Developer/Library/Frameworks, ); ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ""; @@ -3928,6 +3944,10 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + /Developer/Library/Frameworks, + /Developer/Library/PrivateFrameworks, + /System/Developer/Library/PrivateFrameworks, + /System/Developer/Library/Frameworks, ); OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.facebook.WebDriverAgentLib; @@ -3988,6 +4008,10 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + /Developer/Library/Frameworks, + /Developer/Library/PrivateFrameworks, + /System/Developer/Library/PrivateFrameworks, + /System/Developer/Library/Frameworks, ); ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ""; @@ -4222,6 +4246,10 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + /Developer/Library/Frameworks, + /Developer/Library/PrivateFrameworks, + /System/Developer/Library/PrivateFrameworks, + /System/Developer/Library/Frameworks, ); OTHER_LDFLAGS = ( "$(inherited)", @@ -4270,6 +4298,10 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + /Developer/Library/Frameworks, + /Developer/Library/PrivateFrameworks, + /System/Developer/Library/PrivateFrameworks, + /System/Developer/Library/Frameworks, ); ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( From 03b6b2fa102da21e5e8e68011b2e3d16b516712b Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 24 Sep 2023 11:27:28 -0700 Subject: [PATCH 8/9] add FBUtf8SafeDictionary for tv as well --- WebDriverAgent.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WebDriverAgent.xcodeproj/project.pbxproj b/WebDriverAgent.xcodeproj/project.pbxproj index 4fad9a131..3630797a6 100644 --- a/WebDriverAgent.xcodeproj/project.pbxproj +++ b/WebDriverAgent.xcodeproj/project.pbxproj @@ -312,6 +312,8 @@ 64B26508228C5514002A5025 /* XCUIElementDouble.m in Sources */ = {isa = PBXBuildFile; fileRef = 64B26507228C5514002A5025 /* XCUIElementDouble.m */; }; 64B2650A228CE4FF002A5025 /* FBTVNavigationTracker-Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 64B26509228CE4FF002A5025 /* FBTVNavigationTracker-Private.h */; }; 64B2650B228CE4FF002A5025 /* FBTVNavigationTracker-Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 64B26509228CE4FF002A5025 /* FBTVNavigationTracker-Private.h */; }; + 64E3502E2AC0B6EB005F3ACB /* NSDictionary+FBUtf8SafeDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = 716F0DA02A16CA1000CDD977 /* NSDictionary+FBUtf8SafeDictionary.m */; }; + 64E3502F2AC0B6FE005F3ACB /* NSDictionary+FBUtf8SafeDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 716F0D9F2A16CA1000CDD977 /* NSDictionary+FBUtf8SafeDictionary.h */; }; 711084441DA3AA7500F913D6 /* FBXPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 711084421DA3AA7500F913D6 /* FBXPath.h */; settings = {ATTRIBUTES = (Public, ); }; }; 711084451DA3AA7500F913D6 /* FBXPath.m in Sources */ = {isa = PBXBuildFile; fileRef = 711084431DA3AA7500F913D6 /* FBXPath.m */; }; 7119097C2152580600BA3C7E /* XCUIScreen.h in Headers */ = {isa = PBXBuildFile; fileRef = 7119097B2152580600BA3C7E /* XCUIScreen.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -2382,6 +2384,7 @@ 641EE6A62240C5CA00173FCB /* FBImageIOScaler.h in Headers */, 641EE6A72240C5CA00173FCB /* FBSession-Private.h in Headers */, 641EE6A82240C5CA00173FCB /* NSString+FBXMLSafeString.h in Headers */, + 64E3502F2AC0B6FE005F3ACB /* NSDictionary+FBUtf8SafeDictionary.h in Headers */, 641EE6A92240C5CA00173FCB /* FBCommandStatus.h in Headers */, 71822702258744A400661B83 /* HTTPResponseProxy.h in Headers */, 71822741258744BB00661B83 /* HTTPLogging.h in Headers */, @@ -3048,6 +3051,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 64E3502E2AC0B6EB005F3ACB /* NSDictionary+FBUtf8SafeDictionary.m in Sources */, 718226CF2587443700661B83 /* GCDAsyncSocket.m in Sources */, E444DCBC24917A5E0060D7EB /* HTTPResponseProxy.m in Sources */, 71D3B3D8267FC7260076473D /* XCUIElement+FBResolve.m in Sources */, From 2cb62d28536d0a77565abc78cade02adba730cd6 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Mon, 25 Sep 2023 10:52:59 -0700 Subject: [PATCH 9/9] Update publish.js.yml --- .github/workflows/publish.js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.js.yml b/.github/workflows/publish.js.yml index a2b46c405..92299e7a8 100644 --- a/.github/workflows/publish.js.yml +++ b/.github/workflows/publish.js.yml @@ -47,7 +47,7 @@ jobs: - name: Creating a zip of WebDriverAgentRunner-Runner.app for iOS after removing test frameworks run: | pushd appium_wda_ios/Build/Products/Debug-iphoneos - rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XCT*.framework + rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XC*.framework zip -r $ZIP_PKG_NAME_IOS WebDriverAgentRunner-Runner.app popd mv $PKG_PATH_IOS/Build/Products/Debug-iphoneos/$ZIP_PKG_NAME_IOS ./ @@ -62,7 +62,7 @@ jobs: - name: Creating a zip of WebDriverAgentRunner-Runner.app for tvOS after removing test frameworks run: | pushd appium_wda_tvos/Build/Products/Debug-appletvos - rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XCT*.framework + rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XC*.framework zip -r $ZIP_PKG_NAME_TVOS WebDriverAgentRunner_tvOS-Runner.app popd mv $PKG_PATH_TVOS/Build/Products/Debug-appletvos/$ZIP_PKG_NAME_TVOS ./