diff --git a/React/third-party.xcconfig b/React/third-party.xcconfig index e4262ca0387954..2c163835cfaf4b 100644 --- a/React/third-party.xcconfig +++ b/React/third-party.xcconfig @@ -8,5 +8,5 @@ // LICENSE file in the root directory of this source tree. // -HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_76_0 $(SRCROOT)/../third-party/folly-2021.07.22.00 $(SRCROOT)/../third-party/glog-0.3.5/src +HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_81_0 $(SRCROOT)/../third-party/folly-2021.07.22.00 $(SRCROOT)/../third-party/glog-0.3.5/src OTHER_CFLAGS = -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 diff --git a/ReactAndroid/Android-prebuilt.mk b/ReactAndroid/Android-prebuilt.mk index 269cf0ac0aa522..0b8e9b9bccc8ca 100644 --- a/ReactAndroid/Android-prebuilt.mk +++ b/ReactAndroid/Android-prebuilt.mk @@ -34,7 +34,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := folly_runtime LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfolly_runtime.so LOCAL_EXPORT_C_INCLUDES := \ - $(THIRD_PARTY_NDK_DIR)/boost/boost_1_76_0 \ + $(THIRD_PARTY_NDK_DIR)/boost/boost_1_81_0 \ $(THIRD_PARTY_NDK_DIR)/double-conversion \ $(THIRD_PARTY_NDK_DIR)/folly # Note: Sync with folly/Android.mk. diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 52b1de3f872f6f..7c7124b6214314 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -37,7 +37,7 @@ def thirdPartyNdkDir = new File("$buildDir/third-party-ndk") def reactNativeRootDir = projectDir.parent // You need to have following folders in this directory: -// - boost_1_76_0 +// - boost_1_81_0 // - double-conversion-1.1.6 // - folly-deprecate-dynamic-initializer // - glog-0.3.5 diff --git a/ReactAndroid/cmake-utils/Android-prebuilt.cmake b/ReactAndroid/cmake-utils/Android-prebuilt.cmake index 03be4be02aa8c2..abced5c4c3ac62 100644 --- a/ReactAndroid/cmake-utils/Android-prebuilt.cmake +++ b/ReactAndroid/cmake-utils/Android-prebuilt.cmake @@ -49,7 +49,7 @@ set_target_properties(folly_runtime ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libfolly_runtime.so) target_include_directories(folly_runtime INTERFACE - ${THIRD_PARTY_NDK_DIR}/boost/boost_1_76_0 + ${THIRD_PARTY_NDK_DIR}/boost/boost_1_81_0 ${THIRD_PARTY_NDK_DIR}/double-conversion ${THIRD_PARTY_NDK_DIR}/folly) target_compile_options(folly_runtime diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index bc7d1b7b4f9d7c..e9f9aa2e95293c 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -26,7 +26,7 @@ SO_LOADER_VERSION=0.10.4 SWIPEREFRESH_LAYOUT_VERSION=1.0.0 # Native Dependency Versions -BOOST_VERSION=1_76_0 +BOOST_VERSION=1_81_0 DOUBLE_CONVERSION_VERSION=1.1.6 FMT_VERSION=6.2.1 FOLLY_VERSION=2021.07.22.00 diff --git a/ReactAndroid/src/main/jni/third-party/boost/CMakeLists.txt b/ReactAndroid/src/main/jni/third-party/boost/CMakeLists.txt index 3d0cbec7e50956..55143e2c2bb348 100644 --- a/ReactAndroid/src/main/jni/third-party/boost/CMakeLists.txt +++ b/ReactAndroid/src/main/jni/third-party/boost/CMakeLists.txt @@ -18,5 +18,5 @@ add_library(boost STATIC ${boostasm_SRC}) set_target_properties(boost PROPERTIES LINKER_LANGUAGE CXX) -target_include_directories(boost PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/boost_1_76_0) +target_include_directories(boost PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/boost_1_81_0) diff --git a/ReactCommon/cxxreact/React-cxxreact.podspec b/ReactCommon/cxxreact/React-cxxreact.podspec index c4498e9d3f1f80..c4477662b675e5 100644 --- a/ReactCommon/cxxreact/React-cxxreact.podspec +++ b/ReactCommon/cxxreact/React-cxxreact.podspec @@ -36,7 +36,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"" } s.header_dir = "cxxreact" - s.dependency "boost", "1.76.0" + s.dependency "boost", "1.81.0" s.dependency "DoubleConversion" s.dependency "RCT-Folly", folly_version s.dependency "glog" diff --git a/ReactCommon/jsi/React-jsi.podspec b/ReactCommon/jsi/React-jsi.podspec index 0e2ee388889c50..b25298e17e3652 100644 --- a/ReactCommon/jsi/React-jsi.podspec +++ b/ReactCommon/jsi/React-jsi.podspec @@ -37,7 +37,7 @@ Pod::Spec.new do |s| s.header_dir = "jsi" s.default_subspec = "Default" - s.dependency "boost", "1.76.0" + s.dependency "boost", "1.81.0" s.dependency "DoubleConversion" s.dependency "RCT-Folly", folly_version s.dependency "glog" diff --git a/third-party-podspecs/boost.podspec b/third-party-podspecs/boost.podspec index 461a26b046785b..07d7e1401aac48 100644 --- a/third-party-podspecs/boost.podspec +++ b/third-party-podspecs/boost.podspec @@ -5,14 +5,13 @@ Pod::Spec.new do |spec| spec.name = 'boost' - spec.version = '1.76.0' + spec.version = '1.81.0' spec.license = { :type => 'Boost Software License', :file => "LICENSE_1_0.txt" } spec.homepage = 'http://www.boost.org' spec.summary = 'Boost provides free peer-reviewed portable C++ source libraries.' spec.authors = 'Rene Rivera' - # PodToBuild does not support tar bz2 compression so we use tar.gz instead. - spec.source = { :http => 'https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.gz', - :sha256 => '7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca' } # jhgg was here + spec.source = { :http => 'https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.gz', + :sha256 => '205666dea9f6a7cfed87c7a6dfbeb52a2c1b9de55712c9c1a87735d7181452b6' } # Pinning to the same version as React.podspec. spec.platforms = { :ios => '11.0', :tvos => '11.0' }