From ebb83030641bc5d3ec42886bb39993eddc039cf9 Mon Sep 17 00:00:00 2001 From: "bruno.silva" Date: Wed, 19 Nov 2025 11:56:49 +0000 Subject: [PATCH 1/3] [MSDK-3145] try to fix MSDK-3145 --- react-native-usercentrics.podspec | 48 ++++++++++++++++++--- sample/ios/sample.xcodeproj/project.pbxproj | 47 +++++++++----------- sample/ios/sample/Info.plist | 2 + 3 files changed, 63 insertions(+), 34 deletions(-) diff --git a/react-native-usercentrics.podspec b/react-native-usercentrics.podspec index c8298a1b..86fd63a4 100644 --- a/react-native-usercentrics.podspec +++ b/react-native-usercentrics.podspec @@ -20,23 +20,57 @@ Pod::Spec.new do |s| s.dependency 'React-Core' s.dependency 'React-NativeModulesApple' s.dependency 'UsercentricsUI', "#{package['iosPackageVersion']}" + s.dependency 'RNScreens' - s.pod_target_xcconfig = { + # Base C++ configuration + # Note: RCT_NEW_ARCH_ENABLED is inherited from parent project build settings + # This ensures compatibility with Expo's prebuild process + base_cpp_flags = { 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++20', 'CLANG_CXX_LIBRARY' => 'libc++', - 'OTHER_CPLUSPLUSFLAGS' => '-std=c++20 -stdlib=libc++', - 'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/React-Core" "$(PODS_ROOT)/React-NativeModulesApple" "$(PODS_ROOT)/ReactCommon" "$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon"', - 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) RCT_NEW_ARCH_ENABLED=0', + 'OTHER_CPLUSPLUSFLAGS' => '-std=c++20 -stdlib=libc++ $(inherited)', 'CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER' => 'NO', 'CLANG_WARN_DOCUMENTATION_COMMENTS' => 'NO', - 'GCC_WARN_INHIBIT_ALL_WARNINGS' => 'YES' + 'GCC_WARN_INHIBIT_ALL_WARNINGS' => 'YES', + 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES', + 'DEFINES_MODULE' => 'YES', + # Ensure C++ standard library headers are accessible + 'USE_HEADERMAP' => 'YES', + 'ALWAYS_SEARCH_USER_PATHS' => 'NO' } + # Header search paths - include React Native and C++ standard library paths + header_search_paths = [ + '$(PODS_ROOT)/React-Core', + '$(PODS_ROOT)/React-NativeModulesApple', + '$(PODS_ROOT)/ReactCommon', + '$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon', + '$(PODS_TARGET_SRCROOT)', + '$(PODS_ROOT)/Headers/Public', + '$(PODS_ROOT)/Headers/Public/React-Core', + '$(PODS_ROOT)/Headers/Public/ReactCommon' + ] + + # Add new architecture paths if available (will be resolved at build time) + header_search_paths += [ + '$(PODS_ROOT)/Headers/Public/React-Fabric', + '$(PODS_ROOT)/Headers/Public/React-Codegen', + '$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers', + '$(PODS_CONFIGURATION_BUILD_DIR)/React-Fabric/React_Fabric.framework/Headers' + ] + + base_cpp_flags['HEADER_SEARCH_PATHS'] = header_search_paths.map { |path| "\"#{path}\"" }.join(' ') + + # Preprocessor definitions - inherit RCT_NEW_ARCH_ENABLED from parent project + # This allows Expo/React Native to control the new architecture flag + base_cpp_flags['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited)' + + s.pod_target_xcconfig = base_cpp_flags + s.user_target_xcconfig = { 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++20', 'CLANG_CXX_LIBRARY' => 'libc++', - 'OTHER_CPLUSPLUSFLAGS' => '-std=c++20 -stdlib=libc++', - 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) RCT_NEW_ARCH_ENABLED=0', + 'OTHER_CPLUSPLUSFLAGS' => '-std=c++20 -stdlib=libc++ $(inherited)', 'CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER' => 'NO', 'CLANG_WARN_DOCUMENTATION_COMMENTS' => 'NO', 'GCC_WARN_INHIBIT_ALL_WARNINGS' => 'YES' diff --git a/sample/ios/sample.xcodeproj/project.pbxproj b/sample/ios/sample.xcodeproj/project.pbxproj index cf1970f8..167d1513 100644 --- a/sample/ios/sample.xcodeproj/project.pbxproj +++ b/sample/ios/sample.xcodeproj/project.pbxproj @@ -7,12 +7,13 @@ objects = { /* Begin PBXBuildFile section */ + 0E4C580DEEB64536E20F9648 /* Pods_sample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 918B0A97B42EE4DB5846EED8 /* Pods_sample.framework */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 34B3E2DD783AD296B9753613 /* Pods_sample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D5881D94DCC31AD3CAAE15C6 /* Pods_sample.framework */; }; + 4B110119111F1B4E69B668CD /* Pods_sampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8194E5BF509496886EB6B66 /* Pods_sampleTests.framework */; }; 761780ED2CA45674006654EE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 761780EC2CA45674006654EE /* AppDelegate.swift */; }; 77548F352FCA728ECC0F1955 /* Pods_sampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17CBE8E177E7C75B9B4ED45E /* Pods_sampleTests.framework */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; - 82EB8D8E4ED3004B625C802B /* Pods_sample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03D4F505F8B3DA10FC759D02 /* Pods_sample.framework */; }; D3AD968898A2D5F12A3B498E /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */; }; /* End PBXBuildFile section */ @@ -37,8 +38,10 @@ 62CB991CB5627A302EED8780 /* Pods-sampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sampleTests.debug.xcconfig"; path = "Target Support Files/Pods-sampleTests/Pods-sampleTests.debug.xcconfig"; sourceTree = ""; }; 761780EC2CA45674006654EE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = sample/AppDelegate.swift; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = sample/LaunchScreen.storyboard; sourceTree = ""; }; + 918B0A97B42EE4DB5846EED8 /* Pods_sample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_sample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B876D4792E95685D00879086 /* sampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = sampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; D5881D94DCC31AD3CAAE15C6 /* Pods_sample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_sample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D8194E5BF509496886EB6B66 /* Pods_sampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_sampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; E06B5EC4B4478FD5056A0028 /* Pods-sampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sampleTests.release.xcconfig"; path = "Target Support Files/Pods-sampleTests/Pods-sampleTests.release.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -59,6 +62,7 @@ buildActionMask = 2147483647; files = ( 34B3E2DD783AD296B9753613 /* Pods_sample.framework in Frameworks */, + 0E4C580DEEB64536E20F9648 /* Pods_sample.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -67,6 +71,7 @@ buildActionMask = 2147483647; files = ( 77548F352FCA728ECC0F1955 /* Pods_sampleTests.framework in Frameworks */, + 4B110119111F1B4E69B668CD /* Pods_sampleTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -76,7 +81,6 @@ 13B07FAE1A68108700A75B9A /* sample */ = { isa = PBXGroup; children = ( - 0B9849D52E957E1E007A2589 /* sample-Bridging-Header.h */, 13B07FB51A68108700A75B9A /* Images.xcassets */, 761780EC2CA45674006654EE /* AppDelegate.swift */, 13B07FB61A68108700A75B9A /* Info.plist */, @@ -90,7 +94,8 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - 03D4F505F8B3DA10FC759D02 /* Pods_sample.framework */, + 918B0A97B42EE4DB5846EED8 /* Pods_sample.framework */, + D8194E5BF509496886EB6B66 /* Pods_sampleTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -335,28 +340,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-sample/Pods-sample-resources.sh\"\n"; showEnvVarsInLog = 0; }; - DEDDEEC392033E74160644D3 /* [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-sample-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 */ @@ -512,6 +495,8 @@ "${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", "${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", "${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", + "${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers", + "${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers/platform/ios", ); IPHONEOS_DEPLOYMENT_TARGET = 15.1; LD = ""; @@ -535,7 +520,10 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG"; @@ -597,6 +585,8 @@ "${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", "${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", "${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", + "${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers", + "${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers/platform/ios", ); IPHONEOS_DEPLOYMENT_TARGET = 15.1; LD = ""; @@ -619,7 +609,10 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; diff --git a/sample/ios/sample/Info.plist b/sample/ios/sample/Info.plist index ddbf766b..fc7ea731 100644 --- a/sample/ios/sample/Info.plist +++ b/sample/ios/sample/Info.plist @@ -33,6 +33,8 @@ NSLocationWhenInUseUsageDescription + RCTNewArchEnabled + UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities From ff27bce200c7b5d7958a1ef697167aa042888364 Mon Sep 17 00:00:00 2001 From: islameldesoky1 Date: Fri, 28 Nov 2025 17:45:48 +0000 Subject: [PATCH 2/3] modify cmakeLists, and add 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited)', --- android/src/main/jni/CMakeLists.txt | 61 ++++++++++++----------------- react-native-usercentrics.podspec | 2 +- 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/android/src/main/jni/CMakeLists.txt b/android/src/main/jni/CMakeLists.txt index 6940814e..ae766c1a 100644 --- a/android/src/main/jni/CMakeLists.txt +++ b/android/src/main/jni/CMakeLists.txt @@ -1,8 +1,9 @@ cmake_minimum_required(VERSION 3.13) +project(rn_usercentrics) set(CMAKE_VERBOSE_MAKEFILE ON) # Set library name -set(LIB_TARGET_NAME react_codegen_RNUsercentricsModule) +set(LIB_TARGET_NAME rn_usercentrics) # Add compile options add_compile_options( @@ -32,54 +33,44 @@ target_include_directories( . ) +# Find ReactAndroid package first (required for version detection) +find_package(ReactAndroid REQUIRED CONFIG) + # Link libraries based on React Native version -if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76) +if(DEFINED ReactAndroid_VERSION_MINOR AND ReactAndroid_VERSION_MINOR GREATER_EQUAL 76) target_link_libraries( ${LIB_TARGET_NAME} ReactAndroid::reactnative ReactAndroid::jsi - fbjni::fbjni + ReactAndroid::fbjni + android + log ) else() + # Fallback for older RN versions or when version is not available target_link_libraries( ${LIB_TARGET_NAME} - fbjni - folly_runtime - glog - jsi - react_codegen_rncore - react_debug - react_nativemodule_core - react_render_core - react_render_debug - react_render_graphics - react_render_mapbuffer - react_render_componentregistry - react_utils - rrc_view - turbomodulejsijni - yoga + ReactAndroid::reactnative + ReactAndroid::jsi + android + log ) endif() -# Compile options based on React Native version -if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80) - target_compile_reactnative_options(${LIB_TARGET_NAME} PRIVATE) -else() - target_compile_options( - ${LIB_TARGET_NAME} - PRIVATE - -DLOG_TAG=\"ReactNative\" - -fexceptions - -frtti - -std=c++20 - -Wall - ) -endif() +# Compile options - use standard approach for compatibility +target_compile_options( + ${LIB_TARGET_NAME} + PRIVATE + -DLOG_TAG=\"ReactNative\" + -fexceptions + -frtti + -std=c++20 + -Wall +) # Additional include directories target_include_directories( - ${CMAKE_PROJECT_NAME} - PUBLIC + ${LIB_TARGET_NAME} + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ) \ No newline at end of file diff --git a/react-native-usercentrics.podspec b/react-native-usercentrics.podspec index 86fd63a4..06c6de0e 100644 --- a/react-native-usercentrics.podspec +++ b/react-native-usercentrics.podspec @@ -20,7 +20,6 @@ Pod::Spec.new do |s| s.dependency 'React-Core' s.dependency 'React-NativeModulesApple' s.dependency 'UsercentricsUI', "#{package['iosPackageVersion']}" - s.dependency 'RNScreens' # Base C++ configuration # Note: RCT_NEW_ARCH_ENABLED is inherited from parent project build settings @@ -71,6 +70,7 @@ Pod::Spec.new do |s| 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++20', 'CLANG_CXX_LIBRARY' => 'libc++', 'OTHER_CPLUSPLUSFLAGS' => '-std=c++20 -stdlib=libc++ $(inherited)', + 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited)', 'CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER' => 'NO', 'CLANG_WARN_DOCUMENTATION_COMMENTS' => 'NO', 'GCC_WARN_INHIBIT_ALL_WARNINGS' => 'YES' From 38fa248baff9fa5585db1bfa445497244647dc55 Mon Sep 17 00:00:00 2001 From: islameldesoky1 Date: Tue, 2 Dec 2025 14:42:11 +0000 Subject: [PATCH 3/3] revert sample Info.plist and project.pbxproj to match master --- sample/ios/sample.xcodeproj/project.pbxproj | 47 ++++++++++++--------- sample/ios/sample/Info.plist | 2 - 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/sample/ios/sample.xcodeproj/project.pbxproj b/sample/ios/sample.xcodeproj/project.pbxproj index 167d1513..cf1970f8 100644 --- a/sample/ios/sample.xcodeproj/project.pbxproj +++ b/sample/ios/sample.xcodeproj/project.pbxproj @@ -7,13 +7,12 @@ objects = { /* Begin PBXBuildFile section */ - 0E4C580DEEB64536E20F9648 /* Pods_sample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 918B0A97B42EE4DB5846EED8 /* Pods_sample.framework */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 34B3E2DD783AD296B9753613 /* Pods_sample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D5881D94DCC31AD3CAAE15C6 /* Pods_sample.framework */; }; - 4B110119111F1B4E69B668CD /* Pods_sampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8194E5BF509496886EB6B66 /* Pods_sampleTests.framework */; }; 761780ED2CA45674006654EE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 761780EC2CA45674006654EE /* AppDelegate.swift */; }; 77548F352FCA728ECC0F1955 /* Pods_sampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17CBE8E177E7C75B9B4ED45E /* Pods_sampleTests.framework */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; + 82EB8D8E4ED3004B625C802B /* Pods_sample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03D4F505F8B3DA10FC759D02 /* Pods_sample.framework */; }; D3AD968898A2D5F12A3B498E /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */; }; /* End PBXBuildFile section */ @@ -38,10 +37,8 @@ 62CB991CB5627A302EED8780 /* Pods-sampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sampleTests.debug.xcconfig"; path = "Target Support Files/Pods-sampleTests/Pods-sampleTests.debug.xcconfig"; sourceTree = ""; }; 761780EC2CA45674006654EE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = sample/AppDelegate.swift; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = sample/LaunchScreen.storyboard; sourceTree = ""; }; - 918B0A97B42EE4DB5846EED8 /* Pods_sample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_sample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B876D4792E95685D00879086 /* sampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = sampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; D5881D94DCC31AD3CAAE15C6 /* Pods_sample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_sample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D8194E5BF509496886EB6B66 /* Pods_sampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_sampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; E06B5EC4B4478FD5056A0028 /* Pods-sampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sampleTests.release.xcconfig"; path = "Target Support Files/Pods-sampleTests/Pods-sampleTests.release.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -62,7 +59,6 @@ buildActionMask = 2147483647; files = ( 34B3E2DD783AD296B9753613 /* Pods_sample.framework in Frameworks */, - 0E4C580DEEB64536E20F9648 /* Pods_sample.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -71,7 +67,6 @@ buildActionMask = 2147483647; files = ( 77548F352FCA728ECC0F1955 /* Pods_sampleTests.framework in Frameworks */, - 4B110119111F1B4E69B668CD /* Pods_sampleTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -81,6 +76,7 @@ 13B07FAE1A68108700A75B9A /* sample */ = { isa = PBXGroup; children = ( + 0B9849D52E957E1E007A2589 /* sample-Bridging-Header.h */, 13B07FB51A68108700A75B9A /* Images.xcassets */, 761780EC2CA45674006654EE /* AppDelegate.swift */, 13B07FB61A68108700A75B9A /* Info.plist */, @@ -94,8 +90,7 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - 918B0A97B42EE4DB5846EED8 /* Pods_sample.framework */, - D8194E5BF509496886EB6B66 /* Pods_sampleTests.framework */, + 03D4F505F8B3DA10FC759D02 /* Pods_sample.framework */, ); name = Frameworks; sourceTree = ""; @@ -340,6 +335,28 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-sample/Pods-sample-resources.sh\"\n"; showEnvVarsInLog = 0; }; + DEDDEEC392033E74160644D3 /* [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-sample-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 */ @@ -495,8 +512,6 @@ "${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", "${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", "${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", - "${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers", - "${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers/platform/ios", ); IPHONEOS_DEPLOYMENT_TARGET = 15.1; LD = ""; @@ -520,10 +535,7 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG"; @@ -585,8 +597,6 @@ "${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", "${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", "${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", - "${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers", - "${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers/platform/ios", ); IPHONEOS_DEPLOYMENT_TARGET = 15.1; LD = ""; @@ -609,10 +619,7 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; diff --git a/sample/ios/sample/Info.plist b/sample/ios/sample/Info.plist index fc7ea731..ddbf766b 100644 --- a/sample/ios/sample/Info.plist +++ b/sample/ios/sample/Info.plist @@ -33,8 +33,6 @@ NSLocationWhenInUseUsageDescription - RCTNewArchEnabled - UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities