Skip to content

Commit 99c0f80

Browse files
Flewpyayvery
authored andcommitted
Boost 1.81.0 upgrade, inspired by #39
1 parent 8ffe978 commit 99c0f80

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

React/third-party.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
// LICENSE file in the root directory of this source tree.
99
//
1010

11-
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
11+
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
1212
OTHER_CFLAGS = -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1

ReactAndroid/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def cmakeVersion = System.getenv("CMAKE_VERSION") ?: "3.22.1"
5151
ext.cmake_version = cmakeVersion
5252

5353
// You need to have following folders in this directory:
54-
// - boost_1_76_0
54+
// - boost_1_81_0
5555
// - double-conversion-1.1.6
5656
// - folly-deprecate-dynamic-initializer
5757
// - glog-0.3.5
@@ -157,14 +157,14 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
157157
"folly_runtime",
158158
[
159159
new Pair(new File(buildDir, "third-party-ndk/folly/").absolutePath, ""),
160-
new Pair(new File(buildDir, "third-party-ndk/boost/boost_1_76_0/").absolutePath, ""),
160+
new Pair(new File(buildDir, "third-party-ndk/boost/boost_1_81_0/").absolutePath, ""),
161161
new Pair(new File(buildDir, "third-party-ndk/double-conversion/").absolutePath, ""),
162162
]
163163
),
164164
new PrefabPreprocessingEntry(
165165
"react_nativemodule_core",
166166
[
167-
new Pair(new File(buildDir, "third-party-ndk/boost/boost_1_76_0/").absolutePath, ""),
167+
new Pair(new File(buildDir, "third-party-ndk/boost/boost_1_81_0/").absolutePath, ""),
168168
new Pair(new File(buildDir, "third-party-ndk/double-conversion/").absolutePath, ""),
169169
new Pair(new File(buildDir, "third-party-ndk/folly/").absolutePath, ""),
170170
new Pair(new File(buildDir, "third-party-ndk/glog/exported/").absolutePath, ""),

ReactAndroid/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SO_LOADER_VERSION=0.10.5
2323
SWIPEREFRESH_LAYOUT_VERSION=1.0.0
2424

2525
# Native Dependency Versions
26-
BOOST_VERSION=1_76_0
26+
BOOST_VERSION=1_81_0
2727
DOUBLE_CONVERSION_VERSION=1.1.6
2828
FMT_VERSION=6.2.1
2929
FOLLY_VERSION=2021.07.22.00

ReactAndroid/src/main/jni/third-party/boost/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ add_library(boost STATIC ${boostasm_SRC})
1818

1919
set_target_properties(boost PROPERTIES LINKER_LANGUAGE CXX)
2020

21-
target_include_directories(boost PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/boost_1_76_0)
21+
target_include_directories(boost PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/boost_1_81_0)
2222

ReactCommon/cxxreact/React-cxxreact.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
3737
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
3838
s.header_dir = "cxxreact"
3939

40-
s.dependency "boost", "1.76.0"
40+
s.dependency "boost", "1.81.0"
4141
s.dependency "DoubleConversion"
4242
s.dependency "RCT-Folly", folly_version
4343
s.dependency "glog"

ReactCommon/jsi/React-jsi.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Pod::Spec.new do |s|
3838
s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
3939
s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
4040

41-
s.dependency "boost", "1.76.0"
41+
s.dependency "boost", "1.81.0"
4242
s.dependency "DoubleConversion"
4343
s.dependency "RCT-Folly", folly_version
4444
s.dependency "glog"

third-party-podspecs/boost.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Pod::Spec.new do |spec|
1111
spec.summary = 'Boost provides free peer-reviewed portable C++ source libraries.'
1212
spec.authors = 'Rene Rivera'
1313
# PodToBuild does not support tar bz2 compression so we use tar.gz instead.
14-
spec.source = { :http => 'https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.gz',
15-
:sha256 => '7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca' } # jhgg was here
14+
spec.source = { :http => 'https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.gz',
15+
:sha256 => '205666dea9f6a7cfed87c7a6dfbeb52a2c1b9de55712c9c1a87735d7181452b6' }
1616

1717
# Pinning to the same version as React.podspec.
1818
spec.platforms = { :ios => '11.0' }

0 commit comments

Comments
 (0)