From 505958bf9f47fc05fd5be8f75e2f27fb887fc185 Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Fri, 17 May 2024 15:54:15 -0700 Subject: [PATCH] test --- .gitignore | 6 +- packages/rn-tester/OCMock.podspec | 44 ++++++++ packages/rn-tester/Podfile | 6 +- packages/rn-tester/Podfile.lock | 106 +++++++++--------- .../RNTesterPods.xcodeproj/project.pbxproj | 11 +- 5 files changed, 103 insertions(+), 70 deletions(-) create mode 100644 packages/rn-tester/OCMock.podspec diff --git a/.gitignore b/.gitignore index d4d860c3f30018..48989b4527a75c 100644 --- a/.gitignore +++ b/.gitignore @@ -160,9 +160,13 @@ package-lock.json .circleci/generated_config.yml #[macOS -#Yarn +# Yarn .yarn/* !.yarn/patches/ !.yarn/plugins/ !.yarn/releases/ + +# Ccache +.ccache + # macOS] \ No newline at end of file diff --git a/packages/rn-tester/OCMock.podspec b/packages/rn-tester/OCMock.podspec new file mode 100644 index 00000000000000..616a1428d84779 --- /dev/null +++ b/packages/rn-tester/OCMock.podspec @@ -0,0 +1,44 @@ +Pod::Spec.new do |s| + s.name = "OCMock" + s.version = "3.9.3" + + s.summary = "Mock objects for Objective-C" + s.description = <<-DESC + OCMock is an Objective-C implementation of mock objects. It provides + stubs that return pre-determined values for specific method invocations, + dynamic mocks that can be used to verify interaction patterns, and + partial mocks to overwrite selected methods of existing objects. + DESC + + s.homepage = "http://ocmock.org" + s.documentation_url = "http://ocmock.org/reference/" + s.license = "Apache 2.0" + + s.author = { "Erik Doernenburg" => "erik@doernenburg.com" } + s.social_media_url = "https://toot.thoughtworks.com/@edoernen" + + s.source = { :git => "https://github.com/erikdoe/ocmock.git", :tag => "v3.9.3" } + s.source_files = "Source/OCMock/*.{h,m}" + + s.requires_arc = false + s.osx.deployment_target = '10.15' + s.ios.deployment_target = '12.0' + s.tvos.deployment_target = '12.0' + s.watchos.deployment_target = '7.0' + s.visionos.deployment_target = '1.0' + s.osx.framework = 'XCTest' + s.ios.framework = 'XCTest' + s.tvos.framework = 'XCTest' + s.watchos.framework = 'XCTest' + s.visionos.framework = 'XCTest' + + s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' } + + s.public_header_files = ["OCMock.h", "OCMockObject.h", "OCMArg.h", "OCMConstraint.h", + "OCMLocation.h", "OCMMacroState.h", "OCMRecorder.h", + "OCMStubRecorder.h", "NSNotificationCenter+OCMAdditions.h", + "OCMFunctions.h", "OCMVerifier.h", "OCMQuantifier.h", + "OCMockMacros.h" + ] + .map { |file| "Source/OCMock/" + file } +end \ No newline at end of file diff --git a/packages/rn-tester/Podfile b/packages/rn-tester/Podfile index d1b011fa89eef5..dcda8df30c99a5 100644 --- a/packages/rn-tester/Podfile +++ b/packages/rn-tester/Podfile @@ -78,7 +78,7 @@ end target 'RNTesterUnitTests' do pods('RNTesterUnitTests') pod 'React-RCTTest', :path => "./RCTTest" - pod 'OCMock', :git => 'https://github.com/erikdoe/ocmock.git', :tag => 'v3.9.2' # [visionOS] + pod 'OCMock', :path => 'OCMock.podspec' # [visionOS] end target 'RNTesterIntegrationTests' do @@ -96,7 +96,7 @@ target 'RNTester-macOSUnitTests' do platform :macos, min_macos_version_supported # [macOS] pods('RNTester-macOSUnitTests') pod 'React-RCTTest', :path => "./RCTTest" - pod 'OCMock', :git => 'https://github.com/erikdoe/ocmock.git', :tag => 'v3.9.2' # [visionOS] + pod 'OCMock', :path => 'OCMock.podspec' # [visionOS] end target 'RNTester-macOSIntegrationTests' do @@ -116,7 +116,7 @@ target 'RNTester-visionOSUnitTests' do platform :visionos, min_visionos_version_supported # [macOS] pods('RNTester-visionOSUnitTests') pod 'React-RCTTest', :path => "./RCTTest" - pod 'OCMock', :git => 'https://github.com/erikdoe/ocmock.git', :tag => 'v3.9.2' # [visionOS] + pod 'OCMock', :path => 'OCMock.podspec' # [visionOS] end target 'RNTester-visionOSIntegrationTests' do diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 5439846a1fe685..09c3c43bd2e075 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -11,7 +11,7 @@ PODS: - ReactCommon/turbomodule/core (= 1000.0.0) - fmt (9.1.0) - glog (0.3.5) - - OCMock (3.9.2) + - OCMock (3.9.3) - RCT-Folly (2023.08.07.00): - boost - DoubleConversion @@ -1009,7 +1009,7 @@ DEPENDENCIES: - FBReactNativeSpec (from `../react-native/React/FBReactNativeSpec`) - fmt (from `../react-native/third-party-podspecs/fmt.podspec`) - glog (from `../react-native/third-party-podspecs/glog.podspec`) - - OCMock (from `https://github.com/erikdoe/ocmock.git`, tag `v3.9.2`) + - OCMock (from `OCMock.podspec`) - RCT-Folly (from `../react-native/third-party-podspecs/RCT-Folly.podspec`) - RCT-Folly/Fabric (from `../react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../react-native/Libraries/Required`) @@ -1074,8 +1074,7 @@ EXTERNAL SOURCES: glog: :podspec: "../react-native/third-party-podspecs/glog.podspec" OCMock: - :git: https://github.com/erikdoe/ocmock.git - :tag: v3.9.2 + :path: OCMock.podspec RCT-Folly: :podspec: "../react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -1171,67 +1170,62 @@ EXTERNAL SOURCES: Yoga: :path: "../react-native/ReactCommon/yoga" -CHECKOUT OPTIONS: - OCMock: - :git: https://github.com/erikdoe/ocmock.git - :tag: v3.9.2 - SPEC CHECKSUMS: boost: 0686b6af8cbd638c784fea5afb789be66699823c DoubleConversion: ca54355f8932558971f6643521d62b9bc8231cee - FBLazyVector: 7e98d68fc83be938ec76646e6a631b4d4fd6069b - FBReactNativeSpec: c5f33d1e712566bbb114fb0c926fd13133b79e39 + FBLazyVector: 7277938224aa566a71c9f2c54639a596d39f08eb + FBReactNativeSpec: a4048fa910eec983f92a04ca71f3d0c4bd2d3ce2 fmt: 03574da4b7ba40de39da59677ca66610ce8c4a02 glog: 3a72874c0322c7caf24931d3a2777cb7a3090529 - OCMock: 267d92c078398b7ce11d99e811e3a402744c06bc + OCMock: b34f1034705b22f7ccbe6b25744371723d8b40f0 RCT-Folly: e0ca497e3ebd44051a537b0e95c1dcfa3f4adb8f - RCTRequired: 9e4c51947bc26eae6cab07248cc9a2b1c8e3c82d - RCTTypeSafety: 1d6af8dba9bb56f83dd3cc250b14eaa20e909091 - React: a3734fa8f25e6561220946c0354e9a5b650d0580 - React-callinvoker: c1d7e4603e416733f32bf530a5cf10c8e3f1f860 + RCTRequired: 99fc63eeaaddcde3d029c7951b89e49de1c60899 + RCTTypeSafety: 7eb63d8edb60d2fedc69f6039922c51b649ed32c + React: 7fb80f9a8bbce9c21e2398741d0e79dd37b5dde5 + React-callinvoker: b9c0b51d2909c931bfb6edfedc8752fdb4dbf49c React-Codegen: 9b7fc89f7163d73816eb03fee0d9b870402bc44d - React-Core: f02c2249e323862e64875e045ad615a532edea74 - React-CoreModules: a45cd06e6b255dff42f33dac9723cb7f23f6c236 - React-cxxreact: 176ce64e33fccb0c8f6b4ed6b1abaadeb52075b1 - React-debug: e5f0de92be6c41a7206097a29e346be8149ce877 - React-Fabric: d0bc07dbc347a9c5edbca05fdec45c79680c1b82 - React-FabricImage: da55c00821c41fe8c4065999cb918d29e1cb1778 - React-graphics: 75675fdd29fe6d3ad8f216f09708289a64dafc81 - React-ImageManager: 7c89dd28b710f41991767ebcf41271d9ed4c68b2 - React-jsc: 2e358de5cdbdf0b91fdf364db0d36119fd570d58 - React-jserrorhandler: 2f87b155f38936194879815346652edfedcb457e - React-jsi: c5aecc75f997a3f2da480453f1a9b39f69059cb3 - React-jsiexecutor: dd5b81c10879ee6f2f56326d9fdfa0609bf0aedd - React-jsinspector: 992062809ef43f5cb85eebba3f3cca21594d20f8 - React-logger: 2a1a2bf8499094f6c5c181640cb98978b3feb29e - React-Mapbuffer: c27cccf509dccc8c9ec5a66bd0a508656d1d9814 - React-nativeconfig: 3ec24c2298c6e68660aaff3b6dee3f42757efdd9 - React-NativeModulesApple: 6e23eb231f883aee85955851391f678144ccda85 - React-perflogger: c447be8cd04a76c3335b2063ef8e7cd97b69e654 - React-RCTActionSheet: c0a2118e931a581b41f6bd619a4a3a295aa9dd0c - React-RCTAnimation: 226787815565046b43d7c7aff7e7f0942223ce4a - React-RCTAppDelegate: aded89e31598e66e900dea7757a0ce9f798b6561 - React-RCTBlob: 1a3260531ecad4dedee6ee563627845023a96acb - React-RCTFabric: d991f4ce7a6eb261e4fec0e79ec3b57172632be4 - React-RCTImage: c036e8e4416c542588de5fe6543f18ce50d9d716 - React-RCTLinking: 282d5f7e1fe3cc33f7df2d358407600acc5cae26 - React-RCTNetwork: 6192f2a909570761bd2a8f4469a05edc48049f57 - React-RCTPushNotification: 95dcaf20c2897fb03bbc592084d6a58d3cadd3aa - React-RCTSettings: 028d4ab6b72950fe5bd418f44d4e2cb3ac369188 - React-RCTTest: 209c40bdfcbc70ad44e85090db96ddc6af772f3d - React-RCTText: ea746282e98c755c39c6cb01a040fcc15a296360 - React-RCTVibration: 0fcf81f3e07593bd2d62865cb3a328fb7adab8f1 - React-rendererdebug: b2d08325e17d9aad7129c2095097f24a9b792b30 - React-rncore: 71f83b00bc6a556486b16aa1b96d3d67bc4d225a - React-runtimeexecutor: 30978705b5b9429c4e5493a35bbb2ffd315bbf14 - React-runtimescheduler: deb214bba65d9c85e14b50205aa04e51f597c5a6 - React-utils: a864b7b1073849edfce20645747466ab577b695c - ReactCommon: db5054eae1ec0005c0fe82e129a15ce1459d327f - ReactCommon-Samples: f0dcc856bf969d0a2d432c349b7960986814facd + React-Core: a874f417d028aaeeb79bdec6e757db051dfc0d65 + React-CoreModules: bdd36651b1be44efdbcd7c9bbf756a132aafd5e2 + React-cxxreact: 361afda78b808b6ed85567397de996035d842bd0 + React-debug: 0b9fee2814b0cb75d26578e63996227c812e218e + React-Fabric: 9a22e1712389e59a7b5cb0560d8974b48e152683 + React-FabricImage: 81bfea4df21f39d399445f85124548df12dff192 + React-graphics: aa7ea89beb1c1842d774ad53e52125559cd9e917 + React-ImageManager: ccc1979506e193071e0fe7a0d311e6a1cd871918 + React-jsc: 3dfa35ae421722d4498dc98512c6200c401f1fc2 + React-jserrorhandler: cd9c22003f4237a1f88f05736525ac89ae5d1cde + React-jsi: 224f572328ff125a748a5436d2426ff021c58610 + React-jsiexecutor: 5b2f6f48b56314d314cedfd605b8b86a29857e6c + React-jsinspector: c4059b4882f347965ded1f579b1d18e09ef29cc2 + React-logger: def532fc89b2022f2b2b3f6b49194fcedccb844d + React-Mapbuffer: be9c0f452cf62839a1794707db50f6e811e0b38b + React-nativeconfig: d784fbc90b01423f6b455916047eb3d5fb1ecffe + React-NativeModulesApple: 615a71a4ae6fe39157884eea354fd2c434365328 + React-perflogger: 2c358ca4defbcdf35a9633baf4bbacbd9f54835f + React-RCTActionSheet: 25a83894942c04e0d27b416beb018ef1754f467a + React-RCTAnimation: 99393e4779b0e7106bca950ecfffb303ad3b5d13 + React-RCTAppDelegate: 95be874677722d9b36256dcf725a276feb79b82c + React-RCTBlob: 429f4bb7a6c8ba1b97e5b3a200b83f19ae7ae40b + React-RCTFabric: 7860ad50735457326be73d238379ca46ed77422a + React-RCTImage: 42d8bde21a70911609d295000a401f0dbb26abdc + React-RCTLinking: 81c7786184b02ad737dc8c4948dccc67c4ffd387 + React-RCTNetwork: a2d37091791388a694147ecdbd70508377d98ca4 + React-RCTPushNotification: 18a54f611879b670e5bc6f48448f30c5956a91ef + React-RCTSettings: 35d613bde930b36c81df402907a44aeac2ae982f + React-RCTTest: 7a7930744b00817f8b37a0e42d4016c00b1c601c + React-RCTText: 3cf69139f49d92f4fb5f5af54c4ab2e6fe6b923b + React-RCTVibration: 27242bd002cb38d64aad16728bec861970a448a9 + React-rendererdebug: d435b1268c446f9ceb297260a8e2e05e76c8108b + React-rncore: 6ff7b2f73671bf7c5f5884402d9b73363c0efe82 + React-runtimeexecutor: 71615aa3512d103a23c473f3b8f84f11c05955ef + React-runtimescheduler: bc190e9f3526f6f41a4636aa05297fc7430f33fe + React-utils: c5ab47066c1221bee7e85e0b9eb85a6fdb7e1aeb + ReactCommon: cabd8e68d921fffd9a941fe545c313daa508f86d + ReactCommon-Samples: dc74b1ec42dcb5b92ea993cfe46ced1d8733bb5f ScreenshotManager: b2b5732286c9d80ceca6a8576c4fd9f619608d96 SocketRocket: f6c6249082c011e6de2de60ed641ef8bbe0cfac9 - Yoga: 169b8b334081760c2b6a2671a4961e89af7cfc6d + Yoga: d4c6cae9c1764d32d3a31e48da2b05febc1077e3 -PODFILE CHECKSUM: 4340c3c8d6004c5bb955579c440120f98ead8791 +PODFILE CHECKSUM: 342043a0fbcf2f0a668382a150b1b265fcc84d7d COCOAPODS: 1.14.3 diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index 9ac1292bacea04..38819359e3a7d1 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -1781,17 +1781,14 @@ isa = XCBuildConfiguration; baseConfigurationReference = ADDA9E46D69200872438D869 /* Pods-RNTester-visionOSUnitTests.debug.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; @@ -1823,8 +1820,6 @@ COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; @@ -1856,8 +1851,6 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; @@ -1889,8 +1882,6 @@ CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; LOCALIZATION_PREFERS_STRING_CATALOGS = YES;