Skip to content

Commit 441dff8

Browse files
Fix ios pipeline and build
1 parent be9add7 commit 441dff8

File tree

11 files changed

+7670
-72
lines changed

11 files changed

+7670
-72
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

reader-sdk-react-native-quickstart/android/settings.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/*
2+
include ':react-native-square-reader-sdk'
3+
project(':react-native-square-reader-sdk').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-square-reader-sdk/android')
24
include ':react-native-reanimated'
35
project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-reanimated/android')
46
include ':react-native-gesture-handler'

reader-sdk-react-native-quickstart/ios/Podfile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@ target 'RNReaderSDKSample' do
2626
# use_flipper!()
2727

2828

29+
# pod 'RNReaderSDK', :path => '../node_modules/react-native-square-reader-sdk'
30+
31+
# use_flipper!({
32+
# "Flipper" => "0.99.0",
33+
# 'Flipper-Folly' => '2.6'
34+
# })
2935
post_install do |installer|
36+
# flipper_post_install(installer)
3037
react_native_post_install(installer)
3138

3239
# Apple Silicon builds require a library path tweak for Swift library discovery or "symbol not found" for swift things
@@ -58,6 +65,7 @@ target 'RNReaderSDKSample' do
5865
# ...but if you bump iOS deployment target, Flipper barfs again "Time.h:52:17: error: typedef redefinition with different types"
5966
# We need to make one crude patch to RCT-Folly - set `__IPHONE_10_0` to our iOS target + 1
6067
# https://github.com/facebook/flipper/issues/834 - 84 comments and still going...
61-
`sed -i -e $'s/__IPHONE_10_0/__IPHONE_12_0/' #{installer.sandbox.root}/RCT-Folly/folly/portability/Time.h`
68+
__apply_Xcode_12_5_M1_post_install_workaround(installer)
69+
`sed -i -e $'s/__IPHONE_10_0/__IPHONE_12_0/' Pods/RCT-Folly/folly/portability/Time.h`
6270
end
63-
end
71+
end

reader-sdk-react-native-quickstart/ios/Podfile.lock

Lines changed: 47 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ PODS:
1111
- ReactCommon/turbomodule/core (= 0.67.2)
1212
- fmt (6.2.1)
1313
- glog (0.3.5)
14-
- Permission-Camera (3.6.1):
14+
- Permission-Camera (3.8.4):
1515
- RNPermissions
16-
- Permission-LocationAccuracy (3.6.1):
16+
- Permission-LocationAccuracy (3.8.4):
1717
- RNPermissions
18-
- Permission-LocationAlways (3.6.1):
18+
- Permission-LocationAlways (3.8.4):
1919
- RNPermissions
20-
- Permission-LocationWhenInUse (3.6.1):
20+
- Permission-LocationWhenInUse (3.8.4):
2121
- RNPermissions
22-
- Permission-Microphone (3.6.1):
22+
- Permission-Microphone (3.8.4):
2323
- RNPermissions
2424
- RCT-Folly (2021.06.28.00-v2):
2525
- boost
@@ -288,15 +288,39 @@ PODS:
288288
- React-perflogger (= 0.67.2)
289289
- ReactNativeCameraKit (13.0.0):
290290
- React-Core
291-
- RNGestureHandler (2.9.0):
291+
- RNGestureHandler (2.12.1):
292292
- React-Core
293-
- RNPermissions (3.6.1):
293+
- RNPermissions (3.8.4):
294294
- React-Core
295-
- RNReaderSDK (1.1.4):
295+
- RNReaderSDK (1.7.2):
296296
- React
297-
- RNScreens (3.17.0):
297+
- RNReanimated (3.4.2):
298+
- DoubleConversion
299+
- FBLazyVector
300+
- FBReactNativeSpec
301+
- glog
302+
- RCT-Folly
303+
- RCTRequired
304+
- RCTTypeSafety
305+
- React-callinvoker
298306
- React-Core
307+
- React-Core/DevSupport
308+
- React-Core/RCTWebSocket
309+
- React-CoreModules
310+
- React-cxxreact
311+
- React-jsi
312+
- React-jsiexecutor
313+
- React-jsinspector
314+
- React-RCTActionSheet
315+
- React-RCTAnimation
316+
- React-RCTBlob
299317
- React-RCTImage
318+
- React-RCTLinking
319+
- React-RCTNetwork
320+
- React-RCTSettings
321+
- React-RCTText
322+
- ReactCommon/turbomodule/core
323+
- Yoga
300324
- Yoga (1.14.0)
301325

302326
DEPENDENCIES:
@@ -341,7 +365,7 @@ DEPENDENCIES:
341365
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
342366
- RNPermissions (from `../node_modules/react-native-permissions`)
343367
- RNReaderSDK (from `../node_modules/react-native-square-reader-sdk`)
344-
- RNScreens (from `../node_modules/react-native-screens`)
368+
- RNReanimated (from `../node_modules/react-native-reanimated`)
345369
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
346370

347371
SPEC REPOS:
@@ -427,8 +451,8 @@ EXTERNAL SOURCES:
427451
:path: "../node_modules/react-native-permissions"
428452
RNReaderSDK:
429453
:path: "../node_modules/react-native-square-reader-sdk"
430-
RNScreens:
431-
:path: "../node_modules/react-native-screens"
454+
RNReanimated:
455+
:path: "../node_modules/react-native-reanimated"
432456
Yoga:
433457
:path: "../node_modules/react-native/ReactCommon/yoga"
434458

@@ -439,11 +463,11 @@ SPEC CHECKSUMS:
439463
FBReactNativeSpec: c94002c1d93da3658f4d5119c6994d19961e3d52
440464
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
441465
glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
442-
Permission-Camera: bf6791b17c7f614b6826019fcfdcc286d3a107f6
443-
Permission-LocationAccuracy: 76df17de5c6b8bc2eee34e61ee92cdd7a864c73d
444-
Permission-LocationAlways: 8d99b025c9f73c696e0cdb367e42525f2e9a26f2
445-
Permission-LocationWhenInUse: 3ba99e45c852763f730eabecec2870c2382b7bd4
446-
Permission-Microphone: 48212dd4d28025d9930d583e3c7a56da7268665c
466+
Permission-Camera: 7ec9ee99704766ff9b90198183387a7f5d82b0c1
467+
Permission-LocationAccuracy: a38ddb5c5d0b8e656f3c86e4a500f9bb88bc099d
468+
Permission-LocationAlways: 8fd5518716c3045f9c4edf77b901126098d79b60
469+
Permission-LocationWhenInUse: 24d97eeb25d8ff9f2232e070f792eeb1360ccaf0
470+
Permission-Microphone: 3c985f25f8f89889c9e056622476deb291877194
447471
RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
448472
RCTRequired: cd47794163052d2b8318c891a7a14fcfaccc75ab
449473
RCTTypeSafety: 393bb40b3e357b224cde53d3fec26813c52428b1
@@ -470,12 +494,12 @@ SPEC CHECKSUMS:
470494
React-runtimeexecutor: 2450b43df7ffe8e805a0b3dcb2abd4282f1f1836
471495
ReactCommon: d98c6c96b567f9b3a15f9fd4cc302c1eda8e3cf2
472496
ReactNativeCameraKit: 9d46a5d7dd544ca64aa9c03c150d2348faf437eb
473-
RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39
474-
RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c
475-
RNReaderSDK: c432129543aa152968c6221f68a63aabb03786fe
476-
RNScreens: 0df01424e9e0ed7827200d6ed1087ddd06c493f9
497+
RNGestureHandler: c0d04458598fcb26052494ae23dda8f8f5162b13
498+
RNPermissions: f1b49dd05fa9b83993cd05a9ee115247944d8f1a
499+
RNReaderSDK: 65229885427cbcb29a3ef89309f707c686a7ac9c
500+
RNReanimated: 68ce187141f6e31aaa0726072b02faac962d7862
477501
Yoga: 9b6696970c3289e8dea34b3eda93f23e61fb8121
478502

479-
PODFILE CHECKSUM: 0f9ca6b9b75bc8c474d8f614712bac333b30c418
503+
PODFILE CHECKSUM: a6b9d766a6dbd0253ac491a018ded43a74adab58
480504

481-
COCOAPODS: 1.12.0
505+
COCOAPODS: 1.15.2

0 commit comments

Comments
 (0)