diff --git a/binding/react-native/test-app/RhinoTestApp/ios/Podfile b/binding/react-native/test-app/RhinoTestApp/ios/Podfile index d200f632..32a348a1 100644 --- a/binding/react-native/test-app/RhinoTestApp/ios/Podfile +++ b/binding/react-native/test-app/RhinoTestApp/ios/Podfile @@ -29,7 +29,7 @@ target 'RhinoTestApp' do # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable the next line. - :flipper_configuration => flipper_config, + :flipper_configuration => FlipperConfiguration.disabled, # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/.." ) @@ -47,5 +47,10 @@ target 'RhinoTestApp' do :mac_catalyst_enabled => false ) __apply_Xcode_12_5_M1_post_install_workaround(installer) + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION'] + end + end end end diff --git a/binding/react-native/test-app/RhinoTestApp/ios/RhinoTestApp.xcodeproj/project.pbxproj b/binding/react-native/test-app/RhinoTestApp/ios/RhinoTestApp.xcodeproj/project.pbxproj index 48933cf0..bd887e01 100644 --- a/binding/react-native/test-app/RhinoTestApp/ios/RhinoTestApp.xcodeproj/project.pbxproj +++ b/binding/react-native/test-app/RhinoTestApp/ios/RhinoTestApp.xcodeproj/project.pbxproj @@ -11,7 +11,9 @@ 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 78ADDE67887E4AAEF4ABBB7A /* libPods-RhinoTestApp-RhinoTestAppTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CABEFCA7B9E12FA7885E450B /* libPods-RhinoTestApp-RhinoTestAppTests.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; + B07AA92BC8DDE4F2A688CF5D /* libPods-RhinoTestApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B36D4B7673925A4F02C5D9B /* libPods-RhinoTestApp.a */; }; C70388E02978D40E009FD868 /* Assets.bundle in Resources */ = {isa = PBXBuildFile; fileRef = C70388DF2978D40E009FD868 /* Assets.bundle */; }; /* End PBXBuildFile section */ @@ -35,9 +37,15 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = RhinoTestApp/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RhinoTestApp/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = RhinoTestApp/main.m; sourceTree = ""; }; + 5DB377B59E6EF3FE08A0E628 /* Pods-RhinoTestApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RhinoTestApp.debug.xcconfig"; path = "Target Support Files/Pods-RhinoTestApp/Pods-RhinoTestApp.debug.xcconfig"; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = RhinoTestApp/LaunchScreen.storyboard; sourceTree = ""; }; + 8B36D4B7673925A4F02C5D9B /* libPods-RhinoTestApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RhinoTestApp.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + AC598F0A300529CEB976A282 /* Pods-RhinoTestApp-RhinoTestAppTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RhinoTestApp-RhinoTestAppTests.release.xcconfig"; path = "Target Support Files/Pods-RhinoTestApp-RhinoTestAppTests/Pods-RhinoTestApp-RhinoTestAppTests.release.xcconfig"; sourceTree = ""; }; + AFB06342641BF6B8015EF43B /* Pods-RhinoTestApp-RhinoTestAppTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RhinoTestApp-RhinoTestAppTests.debug.xcconfig"; path = "Target Support Files/Pods-RhinoTestApp-RhinoTestAppTests/Pods-RhinoTestApp-RhinoTestAppTests.debug.xcconfig"; sourceTree = ""; }; C70388DF2978D40E009FD868 /* Assets.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Assets.bundle; path = RhinoTestApp/Assets.bundle; sourceTree = ""; }; + CABEFCA7B9E12FA7885E450B /* libPods-RhinoTestApp-RhinoTestAppTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RhinoTestApp-RhinoTestAppTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; + FBDE9618CE980BE3B214FA8A /* Pods-RhinoTestApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RhinoTestApp.release.xcconfig"; path = "Target Support Files/Pods-RhinoTestApp/Pods-RhinoTestApp.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -45,6 +53,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78ADDE67887E4AAEF4ABBB7A /* libPods-RhinoTestApp-RhinoTestAppTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -52,6 +61,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B07AA92BC8DDE4F2A688CF5D /* libPods-RhinoTestApp.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -93,10 +103,24 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, + 8B36D4B7673925A4F02C5D9B /* libPods-RhinoTestApp.a */, + CABEFCA7B9E12FA7885E450B /* libPods-RhinoTestApp-RhinoTestAppTests.a */, ); name = Frameworks; sourceTree = ""; }; + 56E922A4693E4B4457136C0A /* Pods */ = { + isa = PBXGroup; + children = ( + 5DB377B59E6EF3FE08A0E628 /* Pods-RhinoTestApp.debug.xcconfig */, + FBDE9618CE980BE3B214FA8A /* Pods-RhinoTestApp.release.xcconfig */, + AFB06342641BF6B8015EF43B /* Pods-RhinoTestApp-RhinoTestAppTests.debug.xcconfig */, + AC598F0A300529CEB976A282 /* Pods-RhinoTestApp-RhinoTestAppTests.release.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( @@ -112,6 +136,7 @@ 00E356EF1AD99517003FC87E /* RhinoTestAppTests */, 83CBBA001A601CBA00E9B192 /* Products */, 2D16E6871FA4F8E400B85C8A /* Frameworks */, + 56E922A4693E4B4457136C0A /* Pods */, ); indentWidth = 2; sourceTree = ""; @@ -134,9 +159,12 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "RhinoTestAppTests" */; buildPhases = ( + FFD1462C5F91AD4363592742 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, + 89FC5919A1C08B4633D9B961 /* [CP] Embed Pods Frameworks */, + 57F2BCA4FA620B3F3BB222C5 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -152,11 +180,14 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "RhinoTestApp" */; buildPhases = ( + 12AB5EE0C07D6D6E2DBD4C0D /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, + C85FE3F4596652FA97A65F5A /* [CP] Embed Pods Frameworks */, + B2981835E04E9AB9FDEE982D /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -193,8 +224,6 @@ Base, ); mainGroup = 83CBB9F61A601CBA00E9B192; - packageReferences = ( - ); productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -242,6 +271,96 @@ shellPath = /bin/sh; shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n"; }; + 12AB5EE0C07D6D6E2DBD4C0D /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RhinoTestApp-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 57F2BCA4FA620B3F3BB222C5 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-RhinoTestApp-RhinoTestAppTests/Pods-RhinoTestApp-RhinoTestAppTests-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-RhinoTestApp-RhinoTestAppTests/Pods-RhinoTestApp-RhinoTestAppTests-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RhinoTestApp-RhinoTestAppTests/Pods-RhinoTestApp-RhinoTestAppTests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + 89FC5919A1C08B4633D9B961 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-RhinoTestApp-RhinoTestAppTests/Pods-RhinoTestApp-RhinoTestAppTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-RhinoTestApp-RhinoTestAppTests/Pods-RhinoTestApp-RhinoTestAppTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RhinoTestApp-RhinoTestAppTests/Pods-RhinoTestApp-RhinoTestAppTests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + B2981835E04E9AB9FDEE982D /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-RhinoTestApp/Pods-RhinoTestApp-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-RhinoTestApp/Pods-RhinoTestApp-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RhinoTestApp/Pods-RhinoTestApp-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + C85FE3F4596652FA97A65F5A /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-RhinoTestApp/Pods-RhinoTestApp-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-RhinoTestApp/Pods-RhinoTestApp-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RhinoTestApp/Pods-RhinoTestApp-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; FD10A7F022414F080027D42C /* Start Packager */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -261,6 +380,28 @@ shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n exit 2\n fi\n else\n open \"$SRCROOT/../node_modules/react-native/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n fi\nfi\n"; showEnvVarsInLog = 0; }; + FFD1462C5F91AD4363592742 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RhinoTestApp-RhinoTestAppTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -294,6 +435,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AFB06342641BF6B8015EF43B /* Pods-RhinoTestApp-RhinoTestAppTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; DEVELOPMENT_TEAM = 65723695GD; @@ -321,6 +463,7 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AC598F0A300529CEB976A282 /* Pods-RhinoTestApp-RhinoTestAppTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; @@ -345,6 +488,7 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 5DB377B59E6EF3FE08A0E628 /* Pods-RhinoTestApp.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -372,6 +516,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = FBDE9618CE980BE3B214FA8A /* Pods-RhinoTestApp.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES;