Skip to content

Commit f2470c5

Browse files
terrysahaidakterrysahaidak
committed
Fix ios build
1 parent 074e238 commit f2470c5

File tree

5 files changed

+107
-25687
lines changed

5 files changed

+107
-25687
lines changed

‎Example/ios/Podfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
require_relative '../node_modules/react-native/scripts/react_native_pods'
2-
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
3-
1+
require_relative '../../node_modules/react-native/scripts/react_native_pods'
2+
require_relative '../../node_modules/@react-native-community/cli-platform-ios/native_modules'
43
platform :ios, '11.0'
54

65
target 'ReactNativeGalleryToolkitExample' do
76
config = use_native_modules!
87

9-
use_react_native!(:path => config["reactNativePath"])
8+
9+
use_react_native!(:path => "../../node_modules/react-native")
1010

1111
# Enables Flipper.
1212
#

‎Example/ios/Podfile.lock‎

Lines changed: 96 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,13 @@ PODS:
215215
- React-jsi (= 0.65.1)
216216
- React-perflogger (= 0.65.1)
217217
- React-jsinspector (0.65.1)
218-
- react-native-safe-area-context (3.1.4):
219-
- React
220-
- react-native-video (5.1.0-alpha8):
221-
- React
222-
- react-native-video/Video (= 5.1.0-alpha8)
223-
- react-native-video/Video (5.1.0-alpha8):
224-
- React
218+
- react-native-safe-area-context (3.3.2):
219+
- React-Core
220+
- react-native-video (5.1.1):
221+
- React-Core
222+
- react-native-video/Video (= 5.1.1)
223+
- react-native-video/Video (5.1.1):
224+
- React-Core
225225
- React-perflogger (0.65.1)
226226
- React-RCTActionSheet (0.65.1):
227227
- React-Core/RCTActionSheetHeaders (= 0.65.1)
@@ -286,12 +286,12 @@ PODS:
286286
- React-cxxreact (= 0.65.1)
287287
- React-jsi (= 0.65.1)
288288
- React-perflogger (= 0.65.1)
289-
- RNCMaskedView (0.1.10):
290-
- React
291-
- RNFastImage (8.1.5):
289+
- RNCMaskedView (0.1.11):
292290
- React
293-
- SDWebImage (~> 5.0)
294-
- SDWebImageWebPCoder (~> 0.4.1)
291+
- RNFastImage (8.5.11):
292+
- React-Core
293+
- SDWebImage (~> 5.11.1)
294+
- SDWebImageWebPCoder (~> 0.8.4)
295295
- RNGestureHandler (1.10.3):
296296
- React-Core
297297
- RNReanimated (2.2.3):
@@ -323,54 +323,54 @@ PODS:
323323
- React-RCTVibration
324324
- ReactCommon/turbomodule/core
325325
- Yoga
326-
- RNScreens (2.10.1):
327-
- React
326+
- RNScreens (2.18.1):
327+
- React-Core
328328
- SDWebImage (5.11.1):
329329
- SDWebImage/Core (= 5.11.1)
330330
- SDWebImage/Core (5.11.1)
331-
- SDWebImageWebPCoder (0.4.1):
331+
- SDWebImageWebPCoder (0.8.4):
332332
- libwebp (~> 1.0)
333-
- SDWebImage/Core (~> 5.5)
333+
- SDWebImage/Core (~> 5.10)
334334
- Yoga (1.14.0)
335335

336336
DEPENDENCIES:
337-
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
338-
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
339-
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
340-
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
341-
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
342-
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
343-
- RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
344-
- React (from `../node_modules/react-native/`)
345-
- React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
346-
- React-Core (from `../node_modules/react-native/`)
347-
- React-Core/DevSupport (from `../node_modules/react-native/`)
348-
- React-Core/RCTWebSocket (from `../node_modules/react-native/`)
349-
- React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
350-
- React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
351-
- React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
352-
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
353-
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
354-
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
355-
- react-native-video (from `../node_modules/react-native-video`)
356-
- React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
357-
- React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
358-
- React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
359-
- React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
360-
- React-RCTImage (from `../node_modules/react-native/Libraries/Image`)
361-
- React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`)
362-
- React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`)
363-
- React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`)
364-
- React-RCTText (from `../node_modules/react-native/Libraries/Text`)
365-
- React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
366-
- React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
367-
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
368-
- "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
369-
- RNFastImage (from `../node_modules/react-native-fast-image`)
370-
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
371-
- RNReanimated (from `../node_modules/react-native-reanimated`)
372-
- RNScreens (from `../node_modules/react-native-screens`)
373-
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
337+
- DoubleConversion (from `../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
338+
- FBLazyVector (from `../../node_modules/react-native/Libraries/FBLazyVector`)
339+
- FBReactNativeSpec (from `../../node_modules/react-native/React/FBReactNativeSpec`)
340+
- glog (from `../../node_modules/react-native/third-party-podspecs/glog.podspec`)
341+
- RCT-Folly (from `../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
342+
- RCTRequired (from `../../node_modules/react-native/Libraries/RCTRequired`)
343+
- RCTTypeSafety (from `../../node_modules/react-native/Libraries/TypeSafety`)
344+
- React (from `../../node_modules/react-native/`)
345+
- React-callinvoker (from `../../node_modules/react-native/ReactCommon/callinvoker`)
346+
- React-Core (from `../../node_modules/react-native/`)
347+
- React-Core/DevSupport (from `../../node_modules/react-native/`)
348+
- React-Core/RCTWebSocket (from `../../node_modules/react-native/`)
349+
- React-CoreModules (from `../../node_modules/react-native/React/CoreModules`)
350+
- React-cxxreact (from `../../node_modules/react-native/ReactCommon/cxxreact`)
351+
- React-jsi (from `../../node_modules/react-native/ReactCommon/jsi`)
352+
- React-jsiexecutor (from `../../node_modules/react-native/ReactCommon/jsiexecutor`)
353+
- React-jsinspector (from `../../node_modules/react-native/ReactCommon/jsinspector`)
354+
- react-native-safe-area-context (from `../../node_modules/react-native-safe-area-context`)
355+
- react-native-video (from `../../node_modules/react-native-video`)
356+
- React-perflogger (from `../../node_modules/react-native/ReactCommon/reactperflogger`)
357+
- React-RCTActionSheet (from `../../node_modules/react-native/Libraries/ActionSheetIOS`)
358+
- React-RCTAnimation (from `../../node_modules/react-native/Libraries/NativeAnimation`)
359+
- React-RCTBlob (from `../../node_modules/react-native/Libraries/Blob`)
360+
- React-RCTImage (from `../../node_modules/react-native/Libraries/Image`)
361+
- React-RCTLinking (from `../../node_modules/react-native/Libraries/LinkingIOS`)
362+
- React-RCTNetwork (from `../../node_modules/react-native/Libraries/Network`)
363+
- React-RCTSettings (from `../../node_modules/react-native/Libraries/Settings`)
364+
- React-RCTText (from `../../node_modules/react-native/Libraries/Text`)
365+
- React-RCTVibration (from `../../node_modules/react-native/Libraries/Vibration`)
366+
- React-runtimeexecutor (from `../../node_modules/react-native/ReactCommon/runtimeexecutor`)
367+
- ReactCommon/turbomodule/core (from `../../node_modules/react-native/ReactCommon`)
368+
- "RNCMaskedView (from `../../node_modules/@react-native-community/masked-view`)"
369+
- RNFastImage (from `../../node_modules/react-native-fast-image`)
370+
- RNGestureHandler (from `../../node_modules/react-native-gesture-handler`)
371+
- RNReanimated (from `../../node_modules/react-native-reanimated`)
372+
- RNScreens (from `../../node_modules/react-native-screens`)
373+
- Yoga (from `../../node_modules/react-native/ReactCommon/yoga`)
374374

375375
SPEC REPOS:
376376
trunk:
@@ -382,75 +382,75 @@ SPEC REPOS:
382382

383383
EXTERNAL SOURCES:
384384
DoubleConversion:
385-
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
385+
:podspec: "../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
386386
FBLazyVector:
387-
:path: "../node_modules/react-native/Libraries/FBLazyVector"
387+
:path: "../../node_modules/react-native/Libraries/FBLazyVector"
388388
FBReactNativeSpec:
389-
:path: "../node_modules/react-native/React/FBReactNativeSpec"
389+
:path: "../../node_modules/react-native/React/FBReactNativeSpec"
390390
glog:
391-
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
391+
:podspec: "../../node_modules/react-native/third-party-podspecs/glog.podspec"
392392
RCT-Folly:
393-
:podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
393+
:podspec: "../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
394394
RCTRequired:
395-
:path: "../node_modules/react-native/Libraries/RCTRequired"
395+
:path: "../../node_modules/react-native/Libraries/RCTRequired"
396396
RCTTypeSafety:
397-
:path: "../node_modules/react-native/Libraries/TypeSafety"
397+
:path: "../../node_modules/react-native/Libraries/TypeSafety"
398398
React:
399-
:path: "../node_modules/react-native/"
399+
:path: "../../node_modules/react-native/"
400400
React-callinvoker:
401-
:path: "../node_modules/react-native/ReactCommon/callinvoker"
401+
:path: "../../node_modules/react-native/ReactCommon/callinvoker"
402402
React-Core:
403-
:path: "../node_modules/react-native/"
403+
:path: "../../node_modules/react-native/"
404404
React-CoreModules:
405-
:path: "../node_modules/react-native/React/CoreModules"
405+
:path: "../../node_modules/react-native/React/CoreModules"
406406
React-cxxreact:
407-
:path: "../node_modules/react-native/ReactCommon/cxxreact"
407+
:path: "../../node_modules/react-native/ReactCommon/cxxreact"
408408
React-jsi:
409-
:path: "../node_modules/react-native/ReactCommon/jsi"
409+
:path: "../../node_modules/react-native/ReactCommon/jsi"
410410
React-jsiexecutor:
411-
:path: "../node_modules/react-native/ReactCommon/jsiexecutor"
411+
:path: "../../node_modules/react-native/ReactCommon/jsiexecutor"
412412
React-jsinspector:
413-
:path: "../node_modules/react-native/ReactCommon/jsinspector"
413+
:path: "../../node_modules/react-native/ReactCommon/jsinspector"
414414
react-native-safe-area-context:
415-
:path: "../node_modules/react-native-safe-area-context"
415+
:path: "../../node_modules/react-native-safe-area-context"
416416
react-native-video:
417-
:path: "../node_modules/react-native-video"
417+
:path: "../../node_modules/react-native-video"
418418
React-perflogger:
419-
:path: "../node_modules/react-native/ReactCommon/reactperflogger"
419+
:path: "../../node_modules/react-native/ReactCommon/reactperflogger"
420420
React-RCTActionSheet:
421-
:path: "../node_modules/react-native/Libraries/ActionSheetIOS"
421+
:path: "../../node_modules/react-native/Libraries/ActionSheetIOS"
422422
React-RCTAnimation:
423-
:path: "../node_modules/react-native/Libraries/NativeAnimation"
423+
:path: "../../node_modules/react-native/Libraries/NativeAnimation"
424424
React-RCTBlob:
425-
:path: "../node_modules/react-native/Libraries/Blob"
425+
:path: "../../node_modules/react-native/Libraries/Blob"
426426
React-RCTImage:
427-
:path: "../node_modules/react-native/Libraries/Image"
427+
:path: "../../node_modules/react-native/Libraries/Image"
428428
React-RCTLinking:
429-
:path: "../node_modules/react-native/Libraries/LinkingIOS"
429+
:path: "../../node_modules/react-native/Libraries/LinkingIOS"
430430
React-RCTNetwork:
431-
:path: "../node_modules/react-native/Libraries/Network"
431+
:path: "../../node_modules/react-native/Libraries/Network"
432432
React-RCTSettings:
433-
:path: "../node_modules/react-native/Libraries/Settings"
433+
:path: "../../node_modules/react-native/Libraries/Settings"
434434
React-RCTText:
435-
:path: "../node_modules/react-native/Libraries/Text"
435+
:path: "../../node_modules/react-native/Libraries/Text"
436436
React-RCTVibration:
437-
:path: "../node_modules/react-native/Libraries/Vibration"
437+
:path: "../../node_modules/react-native/Libraries/Vibration"
438438
React-runtimeexecutor:
439-
:path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
439+
:path: "../../node_modules/react-native/ReactCommon/runtimeexecutor"
440440
ReactCommon:
441-
:path: "../node_modules/react-native/ReactCommon"
441+
:path: "../../node_modules/react-native/ReactCommon"
442442
RNCMaskedView:
443-
:path: "../node_modules/@react-native-community/masked-view"
443+
:path: "../../node_modules/@react-native-community/masked-view"
444444
RNFastImage:
445-
:path: "../node_modules/react-native-fast-image"
445+
:path: "../../node_modules/react-native-fast-image"
446446
RNGestureHandler:
447-
:path: "../node_modules/react-native-gesture-handler"
447+
:path: "../../node_modules/react-native-gesture-handler"
448448
RNReanimated:
449-
:path: "../node_modules/react-native-reanimated"
449+
:path: "../../node_modules/react-native-reanimated"
450450
RNScreens:
451-
:path: "../node_modules/react-native-screens"
451+
:path: "../../node_modules/react-native-screens"
452452
Yoga:
453-
:path: "../node_modules/react-native/ReactCommon/yoga"
453+
:path: "../../node_modules/react-native/ReactCommon/yoga"
454454

455455
SPEC CHECKSUMS:
456456
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
@@ -471,8 +471,8 @@ SPEC CHECKSUMS:
471471
React-jsi: 12913c841713a15f64eabf5c9ad98592c0ec5940
472472
React-jsiexecutor: 43f2542aed3c26e42175b339f8d37fe3dd683765
473473
React-jsinspector: 41e58e5b8e3e0bf061fdf725b03f2144014a8fb0
474-
react-native-safe-area-context: 0ed9288ed4409beabb0817b54efc047286fc84da
475-
react-native-video: 8d97379f3c2322a569f1e27542ad1a646cad9444
474+
react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
475+
react-native-video: 0bb76b6d6b77da3009611586c7dbf817b947f30e
476476
React-perflogger: fd28ee1f2b5b150b00043f0301d96bd417fdc339
477477
React-RCTActionSheet: 7f3fa0855c346aa5d7c60f9ced16e067db6d29fa
478478
React-RCTAnimation: 2119a18ee26159004b001bc56404ca5dbaae6077
@@ -485,15 +485,15 @@ SPEC CHECKSUMS:
485485
React-RCTVibration: 92d41c2442e5328cc4d342cd7f78e5876b68bae5
486486
React-runtimeexecutor: 85187f19dd9c47a7c102f9994f9d14e4dc2110de
487487
ReactCommon: eafed38eec7b591c31751bfa7494801618460459
488-
RNCMaskedView: f5c7d14d6847b7b44853f7acb6284c1da30a3459
489-
RNFastImage: 35ae972d6727c84ee3f5c6897e07f84d0a3445e9
488+
RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
489+
RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
490490
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
491491
RNReanimated: aaf2cf65595b293daae808015761a6014a97b284
492-
RNScreens: b748efec66e095134c7166ca333b628cd7e6f3e2
492+
RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
493493
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
494-
SDWebImageWebPCoder: 36f8f47bd9879a8aea6044765c1351120fd8e3a8
494+
SDWebImageWebPCoder: f93010f3f6c031e2f8fb3081ca4ee6966c539815
495495
Yoga: aa0cb45287ebe1004c02a13f279c55a95f1572f4
496496

497-
PODFILE CHECKSUM: b2c65b7bcd8512f7f300400eb5aaaff53fe82171
497+
PODFILE CHECKSUM: 42ff09bf9e1260bad775ffe629bae00473f1162c
498498

499-
COCOAPODS: 1.10.1
499+
COCOAPODS: 1.11.2

‎Example/ios/ReactNativeGalleryToolkitExample.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
LastUpgradeCheck = 1130;
166166
TargetAttributes = {
167167
13B07F861A680F5B00A75B9A = {
168-
DevelopmentTeam = 82VJ4P93XA;
168+
DevelopmentTeam = SJG3WXD6DD;
169169
LastSwiftMigration = 1120;
170170
ProvisioningStyle = Automatic;
171171
};
@@ -214,7 +214,7 @@
214214
);
215215
runOnlyForDeploymentPostprocessing = 0;
216216
shellPath = /bin/sh;
217-
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
217+
shellScript = "export NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh\n";
218218
};
219219
4AD2C5508790C76CFD507DD5 /* [CP] Copy Pods Resources */ = {
220220
isa = PBXShellScriptBuildPhase;
@@ -311,7 +311,7 @@
311311
CODE_SIGN_IDENTITY = "Apple Development";
312312
CODE_SIGN_STYLE = Automatic;
313313
CURRENT_PROJECT_VERSION = 1;
314-
DEVELOPMENT_TEAM = 82VJ4P93XA;
314+
DEVELOPMENT_TEAM = SJG3WXD6DD;
315315
ENABLE_BITCODE = NO;
316316
GCC_PREPROCESSOR_DEFINITIONS = (
317317
"$(inherited)",
@@ -324,7 +324,7 @@
324324
"-ObjC",
325325
"-lc++",
326326
);
327-
PRODUCT_BUNDLE_IDENTIFIER = com.terrysahaidak.gallerytoolkit.ReactNativeGalleryToolkitExample;
327+
PRODUCT_BUNDLE_IDENTIFIER = com.terrysahaidak.gallerytoolkit.Example;
328328
PRODUCT_NAME = ReactNativeGalleryToolkitExample;
329329
PROVISIONING_PROFILE_SPECIFIER = "";
330330
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -340,17 +340,17 @@
340340
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
341341
CLANG_ENABLE_MODULES = YES;
342342
CODE_SIGN_IDENTITY = "Apple Development";
343-
CODE_SIGN_STYLE = Automatic;
343+
CODE_SIGN_STYLE = Manual;
344344
CURRENT_PROJECT_VERSION = 1;
345-
DEVELOPMENT_TEAM = 82VJ4P93XA;
345+
DEVELOPMENT_TEAM = "";
346346
INFOPLIST_FILE = ReactNativeGalleryToolkitExample/Info.plist;
347347
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
348348
OTHER_LDFLAGS = (
349349
"$(inherited)",
350350
"-ObjC",
351351
"-lc++",
352352
);
353-
PRODUCT_BUNDLE_IDENTIFIER = com.terrysahaidak.gallerytoolkit.ReactNativeGalleryToolkitExample;
353+
PRODUCT_BUNDLE_IDENTIFIER = com.terrysahaidak.gallerytoolkit.Example;
354354
PRODUCT_NAME = ReactNativeGalleryToolkitExample;
355355
PROVISIONING_PROFILE_SPECIFIER = "";
356356
SWIFT_VERSION = 5.0;

0 commit comments

Comments
 (0)