Skip to content

Commit 1776ee5

Browse files
author
Heart
committed
Merge branch 'release/0.1.21'
2 parents 50ab4e7 + 39be107 commit 1776ee5

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

example/ios/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PODS:
88
- hermes-engine (0.77.0):
99
- hermes-engine/Pre-built (= 0.77.0)
1010
- hermes-engine/Pre-built (0.77.0)
11-
- pam-react-native (0.1.19):
11+
- pam-react-native (0.1.21):
1212
- DoubleConversion
1313
- glog
1414
- hermes-engine
@@ -1767,7 +1767,7 @@ SPEC CHECKSUMS:
17671767
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
17681768
glog: eb93e2f488219332457c3c4eafd2738ddc7e80b8
17691769
hermes-engine: 1f783c3d53940aed0d2c84586f0b7a85ab7827ef
1770-
pam-react-native: 95e82b481c5ddcfac9c73f369ecb772943520de6
1770+
pam-react-native: 6dfed0fd3109bf6ede983b0cc839b526ee34b5ec
17711771
RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82
17721772
RCTDeprecation: f5c19ebdb8804b53ed029123eb69914356192fc8
17731773
RCTRequired: 6ae6cebe470486e0e0ce89c1c0eabb998e7c51f4
@@ -1832,4 +1832,4 @@ SPEC CHECKSUMS:
18321832

18331833
PODFILE CHECKSUM: a6c35558c55bfc9d6bbc1f21f6bb0e706def72c6
18341834

1835-
COCOAPODS: 1.15.2
1835+
COCOAPODS: 1.16.2

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pam-react-native",
3-
"version": "0.1.20",
3+
"version": "0.1.21",
44
"description": "Pam SDK for React Native",
55
"source": "./src/index.tsx",
66
"main": "./lib/commonjs/index.js",

pam-react-native.podspec

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@ Pod::Spec.new do |s|
1616

1717
s.source_files = "ios/**/*.{h,mm,swift}"
1818

19-
s.pod_target_xcconfig = {
20-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Public/React-Core\""
19+
# s.pod_target_xcconfig = {
20+
# "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Public/React-Core\""
21+
# }
22+
s.pod_target_xcconfig = {
23+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Public/React-Core\" \"$(PODS_ROOT)/Headers/Public/RCTRequired\" \"$(PODS_ROOT)/Headers/Public\"",
2124
}
2225

26+
# s.dependency "React-Core"
27+
# s.dependency "React-RCTRequired"
28+
2329
# Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
2430
# See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
2531
if respond_to?(:install_modules_dependencies, true)
@@ -32,7 +38,7 @@ Pod::Spec.new do |s|
3238
if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
3339
s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
3440
s.pod_target_xcconfig = {
35-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Public/React-Core\"",
41+
# "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Public/React-Core\" \"$(PODS_ROOT)/Headers/Public/RCTRequired\" \"$(PODS_ROOT)/Headers/Public\"",
3642
"OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
3743
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
3844
}

0 commit comments

Comments
 (0)