diff --git a/.circleci/configurations/top_level.yml b/.circleci/configurations/top_level.yml index fd25dab7892..1ea277e6610 100644 --- a/.circleci/configurations/top_level.yml +++ b/.circleci/configurations/top_level.yml @@ -90,12 +90,12 @@ references: hermes_dsym_debug_cache_key: &hermes_dsym_debug_cache_key v3-hermes-debug-dsym-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }} hermes_dsym_release_cache_key: &hermes_dsym_release_cache_key v3-hermes-release-dsym-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }} # Cocoapods - RNTester - pods_cache_key: &pods_cache_key v12-pods-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}-{{ checksum "packages/rn-tester/Podfile" }} - cocoapods_cache_key: &cocoapods_cache_key v12-cocoapods-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock" }}-{{ checksum "packages/rn-tester/Podfile" }}-{{ checksum "/tmp/hermes/hermesversion" }} - rntester_podfile_lock_cache_key: &rntester_podfile_lock_cache_key v11-podfilelock-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile" }}-{{ checksum "/tmp/week_year" }}-{{ checksum "/tmp/hermes/hermesversion" }} + pods_cache_key: &pods_cache_key v13-pods-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}-{{ checksum "packages/rn-tester/Podfile" }} + cocoapods_cache_key: &cocoapods_cache_key v13-cocoapods-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock" }}-{{ checksum "packages/rn-tester/Podfile" }}-{{ checksum "/tmp/hermes/hermesversion" }} + rntester_podfile_lock_cache_key: &rntester_podfile_lock_cache_key v12-podfilelock-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile" }}-{{ checksum "/tmp/week_year" }}-{{ checksum "/tmp/hermes/hermesversion" }} # Cocoapods - HelloWorld - helloworld_cocoapods_cache_key: &helloworld_cocoapods_cache_key v2-cocoapods-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/helloworld/ios/Podfile.lock" }}-{{ checksum "packages/helloworld/ios/Podfile" }}-{{ checksum "/tmp/hermes/hermesversion" }} - helloworld_podfile_lock_cache_key: &helloworld_podfile_lock_cache_key v2-podfilelock-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/helloworld/ios/Podfile" }}-{{ checksum "/tmp/week_year" }}-{{ checksum "/tmp/hermes/hermesversion" }} + helloworld_cocoapods_cache_key: &helloworld_cocoapods_cache_key v3-cocoapods-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/helloworld/ios/Podfile.lock" }}-{{ checksum "packages/helloworld/ios/Podfile" }}-{{ checksum "/tmp/hermes/hermesversion" }} + helloworld_podfile_lock_cache_key: &helloworld_podfile_lock_cache_key v3-podfilelock-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/helloworld/ios/Podfile" }}-{{ checksum "/tmp/week_year" }}-{{ checksum "/tmp/hermes/hermesversion" }} cache_paths: hermes_workspace_macos_cache_paths: &hermes_workspace_macos_cache_paths diff --git a/.github/actions/setup-xcode-build-cache/action.yml b/.github/actions/setup-xcode-build-cache/action.yml index 0ce1bc5aaaa..a18274a9402 100644 --- a/.github/actions/setup-xcode-build-cache/action.yml +++ b/.github/actions/setup-xcode-build-cache/action.yml @@ -20,9 +20,9 @@ runs: uses: actions/cache@v4.0.0 with: path: packages/rn-tester/Podfile.lock - key: v9-podfilelock-${{ github.job }}-${{ hashfiles('packages/rn-tester/Podfile') }}-${{ hashfiles('/tmp/week_year') }}-${{ inputs.hermes-version}} + key: v10-podfilelock-${{ github.job }}-${{ hashfiles('packages/rn-tester/Podfile') }}-${{ hashfiles('/tmp/week_year') }}-${{ inputs.hermes-version}} - name: Cache cocoapods uses: actions/cache@v4.0.0 with: path: packages/rn-tester/Pods - key: v11-cocoapods-${{ github.job }}-${{ hashfiles('packages/rn-tester/Podfile.lock') }}-${{ hashfiles('packages/rn-tester/Podfile') }}-${{ inputs.hermes-version}} + key: v12-cocoapods-${{ github.job }}-${{ hashfiles('packages/rn-tester/Podfile.lock') }}-${{ hashfiles('packages/rn-tester/Podfile') }}-${{ inputs.hermes-version}} diff --git a/packages/react-native/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt index 9cef8e89963..fb09e10dfb6 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt @@ -37,6 +37,9 @@ SET(folly_runtime_SRC folly/Unicode.cpp folly/concurrency/CacheLocality.cpp folly/container/detail/F14Table.cpp + folly/detail/base64_detail/Base64_SSE4_2.cpp + folly/detail/base64_detail/Base64Api.cpp + folly/detail/base64_detail/Base64SWAR.cpp folly/detail/FileUtilDetail.cpp folly/detail/Futex.cpp folly/detail/SplitStringSimd.cpp diff --git a/packages/react-native/third-party-podspecs/RCT-Folly.podspec b/packages/react-native/third-party-podspecs/RCT-Folly.podspec index ec77b9b95ed..0e98b6450dd 100644 --- a/packages/react-native/third-party-podspecs/RCT-Folly.podspec +++ b/packages/react-native/third-party-podspecs/RCT-Folly.podspec @@ -41,6 +41,9 @@ Pod::Spec.new do |spec| 'folly/detail/FileUtilDetail.cpp', 'folly/detail/SplitStringSimd.cpp', 'folly/detail/UniqueInstance.cpp', + 'folly/detail/base64_detail/Base64_SSE4_2.cpp', + 'folly/detail/base64_detail/Base64Api.cpp', + 'folly/detail/base64_detail/Base64SWAR.cpp', 'folly/hash/SpookyHashV2.cpp', 'folly/lang/Assume.cpp', 'folly/lang/CString.cpp', @@ -55,6 +58,7 @@ Pod::Spec.new do |spec| 'folly/container/*.h', 'folly/container/detail/*.h', 'folly/detail/*.h', + 'folly/detail/base64_detail/*.h', 'folly/functional/*.h', 'folly/hash/*.h', 'folly/lang/*.h', @@ -70,6 +74,7 @@ Pod::Spec.new do |spec| 'folly/container/*.h', 'folly/container/detail/*.h', 'folly/detail/*.h', + 'folly/detail/base64_detail/*.h', 'folly/functional/*.h', 'folly/hash/*.h', 'folly/lang/*.h',