diff --git a/React/third-party.xcconfig b/React/third-party.xcconfig index 63c2bcd93a9e00..7850a61a03f54d 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_63_0 $(SRCROOT)/../third-party/folly-2021.06.28.00 $(SRCROOT)/../third-party/glog-0.3.5/src +HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_76_0 $(SRCROOT)/../third-party/folly-2021.06.28.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 d7d0d593e95f30..269cf0ac0aa522 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_63_0 \ + $(THIRD_PARTY_NDK_DIR)/boost/boost_1_76_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 993643d3468966..41f7a3ce8be411 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -32,7 +32,7 @@ def thirdPartyNdkDir = new File("$buildDir/third-party-ndk") def reactNativeRootDir = projectDir.parent // You need to have following folders in this directory: -// - boost_1_63_0 +// - boost_1_76_0 // - double-conversion-1.1.6 // - folly-deprecate-dynamic-initializer // - glog-0.3.5 @@ -56,7 +56,7 @@ task createNativeDepsDirectories { } task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) { - src("https://github.com/react-native-community/boost-for-react-native/releases/download/v${BOOST_VERSION.replace("_", ".")}-0/boost_${BOOST_VERSION}.tar.gz") + src("https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz") onlyIfNewer(true) overwrite(false) dest(new File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz")) diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index a93702dfcb8fe1..5cdfed78d4d6b0 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -16,7 +16,7 @@ FRESCO_VERSION=2.5.0 OKHTTP_VERSION=4.9.2 SO_LOADER_VERSION=0.10.3 -BOOST_VERSION=1_63_0 +BOOST_VERSION=1_76_0 DOUBLE_CONVERSION_VERSION=1.1.6 FOLLY_VERSION=2021.06.28.00 FMT_VERSION=6.2.1 diff --git a/ReactAndroid/src/main/jni/third-party/boost/Android.mk b/ReactAndroid/src/main/jni/third-party/boost/Android.mk index 7e888b7bb84574..032f8a8b3fc9fc 100644 --- a/ReactAndroid/src/main/jni/third-party/boost/Android.mk +++ b/ReactAndroid/src/main/jni/third-party/boost/Android.mk @@ -6,8 +6,8 @@ include $(CLEAR_VARS) # They are required for Folly futures to compile successfully. LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/asm/$(TARGET_ARCH_ABI)/*.S) -LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0 -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0 +LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_76_0 +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_76_0 LOCAL_MODULE := boost diff --git a/ReactAndroid/src/main/jni/third-party/boost/CMakeLists.txt b/ReactAndroid/src/main/jni/third-party/boost/CMakeLists.txt index 19f8786245355a..3d0cbec7e50956 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_63_0) +target_include_directories(boost PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/boost_1_76_0)