Skip to content

Commit 2942750

Browse files
author
akhenda
committed
fix(build): iOS build after RN upgrade
1 parent 78f6f97 commit 2942750

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+186
-37
lines changed

‎.eslintrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
},
5454
"settings": {
5555
"import/resolver": {
56+
"node": {},
5657
"babel-module": {
5758
"root": ["./src"],
5859
"alias": {

‎ios/Podfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ target 'WAPI' do
3434
pod 'RadarSDK', '~> 1.3.0'
3535
pod 'RNFS', :path => '../node_modules/react-native-fs'
3636
pod 'RCTRestart', :path => '../node_modules/react-native-restart/ios'
37-
pod 'react-native-config', path: '../node_modules/react-native-config'
3837
pod 'BVLinearGradient', :path => '../node_modules/react-native-linear-gradient'
3938
pod 'SentryReactNative', :path => '../node_modules/react-native-sentry/SentryReactNative.podspec'
4039
pod 'ReactNativeExceptionHandler', :path => '../node_modules/react-native-exception-handler/ios/ReactNativeExceptionHandler.podspec'

‎ios/Podfile.lock‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ PODS:
2323
- React
2424
- React (0.56.0):
2525
- React/Core (= 0.56.0)
26-
- react-native-config (0.11.5):
27-
- React
2826
- React/Core (0.56.0):
2927
- yoga (= 0.56.0.React)
3028
- React/CxxBridge (0.56.0):
@@ -98,7 +96,6 @@ DEPENDENCIES:
9896
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
9997
- RadarSDK (~> 1.3.0)
10098
- RCTRestart (from `../node_modules/react-native-restart/ios`)
101-
- react-native-config (from `../node_modules/react-native-config`)
10299
- React/Core (from `../node_modules/react-native`)
103100
- React/CxxBridge (from `../node_modules/react-native`)
104101
- React/DevSupport (from `../node_modules/react-native`)
@@ -131,8 +128,6 @@ EXTERNAL SOURCES:
131128
:path: ../node_modules/react-native-restart/ios
132129
React:
133130
:path: ../node_modules/react-native
134-
react-native-config:
135-
:path: ../node_modules/react-native-config
136131
ReactNativeExceptionHandler:
137132
:path: ../node_modules/react-native-exception-handler/ios/ReactNativeExceptionHandler.podspec
138133
RNFS:
@@ -152,13 +147,12 @@ SPEC CHECKSUMS:
152147
RadarSDK: e73cfee062b9ab25ce540a42e2556a98cdc0276f
153148
RCTRestart: 2f9ddcfd9abb887f123b6580cec64d72fb6cccaa
154149
React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
155-
react-native-config: 408003951fd9d8b1dfd7ebf535f67c315f44d823
156150
ReactNativeExceptionHandler: af388823d41395f59b2b9022e2a3c85af95252fe
157151
RNFS: bbb1a64eb245763daf34aea86f97c97c4e85f74c
158152
Sentry: 7d3ea7176e5184e9c35c12a5825905345807e8c1
159153
SentryReactNative: 787a08161d641dde91dd36d4c8e76f9b0ba4fc84
160154
yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
161155

162-
PODFILE CHECKSUM: 6de2ededba2d0f98393037efa4673d32390c74d6
156+
PODFILE CHECKSUM: b06de3b200bfb1345098b45404a341e394761712
163157

164158
COCOAPODS: 1.4.0

‎ios/WAPI.xcodeproj/project.pbxproj‎

Lines changed: 97 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,17 @@
4444
66D815B447D9073BBF7928B6 /* libPods-WAPI-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00BC07A020FE55C200A7C16F /* libPods-WAPI-tvOS.a */; };
4545
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
4646
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
47+
FAD078088B8F431191D3BF90 /* libReactNativeConfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A07B471C62A745D4B7F6451E /* libReactNativeConfig.a */; };
4748
/* End PBXBuildFile section */
4849

4950
/* Begin PBXContainerItemProxy section */
51+
0069610720FF54410054C055 /* PBXContainerItemProxy */ = {
52+
isa = PBXContainerItemProxy;
53+
containerPortal = B0DDDE04FC5846E7A2036C6C /* ReactNativeConfig.xcodeproj */;
54+
proxyType = 2;
55+
remoteGlobalIDString = EB2648DF1C7BE17A00B8F155;
56+
remoteInfo = ReactNativeConfig;
57+
};
5058
00C302AB1ABCB8CE00DB3ED1 /* PBXContainerItemProxy */ = {
5159
isa = PBXContainerItemProxy;
5260
containerPortal = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
@@ -356,8 +364,10 @@
356364
7ACE454754C5EB2CE45C740F /* Pods-WAPI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WAPI.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WAPI/Pods-WAPI.debug.xcconfig"; sourceTree = "<group>"; };
357365
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
358366
9E5666DE60ACA85C494E6D53 /* Pods-WAPI-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WAPI-tvOSTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WAPI-tvOSTests/Pods-WAPI-tvOSTests.debug.xcconfig"; sourceTree = "<group>"; };
367+
A07B471C62A745D4B7F6451E /* libReactNativeConfig.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libReactNativeConfig.a; sourceTree = "<group>"; };
359368
A8B8A2C36DE7020F09E9A9B3 /* Pods-WAPITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WAPITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WAPITests/Pods-WAPITests.debug.xcconfig"; sourceTree = "<group>"; };
360369
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
370+
B0DDDE04FC5846E7A2036C6C /* ReactNativeConfig.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeConfig.xcodeproj; path = "../node_modules/react-native-config/ios/ReactNativeConfig.xcodeproj"; sourceTree = "<group>"; };
361371
D27D221BEF4983C0D93A4D8F /* Pods-WAPI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WAPI.release.xcconfig"; path = "Pods/Target Support Files/Pods-WAPI/Pods-WAPI.release.xcconfig"; sourceTree = "<group>"; };
362372
FCA0D0D12C7042C7F0BB407E /* Pods-WAPI-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WAPI-tvOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-WAPI-tvOS/Pods-WAPI-tvOS.release.xcconfig"; sourceTree = "<group>"; };
363373
/* End PBXFileReference section */
@@ -393,6 +403,7 @@
393403
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
394404
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
395405
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
406+
FAD078088B8F431191D3BF90 /* libReactNativeConfig.a in Frameworks */,
396407
);
397408
runOnlyForDeploymentPostprocessing = 0;
398409
};
@@ -424,6 +435,22 @@
424435
/* End PBXFrameworksBuildPhase section */
425436

426437
/* Begin PBXGroup section */
438+
006960DE20FF54400054C055 /* Recovered References */ = {
439+
isa = PBXGroup;
440+
children = (
441+
A07B471C62A745D4B7F6451E /* libReactNativeConfig.a */,
442+
);
443+
name = "Recovered References";
444+
sourceTree = "<group>";
445+
};
446+
0069610420FF54410054C055 /* Products */ = {
447+
isa = PBXGroup;
448+
children = (
449+
0069610820FF54410054C055 /* libReactNativeConfig.a */,
450+
);
451+
name = Products;
452+
sourceTree = "<group>";
453+
};
427454
00C302A81ABCB8CE00DB3ED1 /* Products */ = {
428455
isa = PBXGroup;
429456
children = (
@@ -584,6 +611,7 @@
584611
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
585612
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
586613
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
614+
B0DDDE04FC5846E7A2036C6C /* ReactNativeConfig.xcodeproj */,
587615
);
588616
name = Libraries;
589617
sourceTree = "<group>";
@@ -606,6 +634,7 @@
606634
83CBBA001A601CBA00E9B192 /* Products */,
607635
2D16E6871FA4F8E400B85C8A /* Frameworks */,
608636
A1CF18F8BA543F68B4377854 /* Pods */,
637+
006960DE20FF54400054C055 /* Recovered References */,
609638
);
610639
indentWidth = 2;
611640
sourceTree = "<group>";
@@ -740,7 +769,7 @@
740769
83CBB9F71A601CBA00E9B192 /* Project object */ = {
741770
isa = PBXProject;
742771
attributes = {
743-
LastUpgradeCheck = 0610;
772+
LastUpgradeCheck = 610;
744773
ORGANIZATIONNAME = Facebook;
745774
TargetAttributes = {
746775
00E356ED1AD99517003FC87E = {
@@ -821,6 +850,10 @@
821850
ProductGroup = 146834001AC3E56700842450 /* Products */;
822851
ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
823852
},
853+
{
854+
ProductGroup = 0069610420FF54410054C055 /* Products */;
855+
ProjectRef = B0DDDE04FC5846E7A2036C6C /* ReactNativeConfig.xcodeproj */;
856+
},
824857
);
825858
projectRoot = "";
826859
targets = (
@@ -833,6 +866,13 @@
833866
/* End PBXProject section */
834867

835868
/* Begin PBXReferenceProxy section */
869+
0069610820FF54410054C055 /* libReactNativeConfig.a */ = {
870+
isa = PBXReferenceProxy;
871+
fileType = archive.ar;
872+
path = libReactNativeConfig.a;
873+
remoteRef = 0069610720FF54410054C055 /* PBXContainerItemProxy */;
874+
sourceTree = BUILT_PRODUCTS_DIR;
875+
};
836876
00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */ = {
837877
isa = PBXReferenceProxy;
838878
fileType = archive.ar;
@@ -1410,9 +1450,17 @@
14101450
"DEBUG=1",
14111451
"$(inherited)",
14121452
);
1453+
HEADER_SEARCH_PATHS = (
1454+
"$(inherited)",
1455+
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
1456+
);
14131457
INFOPLIST_FILE = WAPITests/Info.plist;
14141458
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
14151459
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1460+
LIBRARY_SEARCH_PATHS = (
1461+
"$(inherited)",
1462+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1463+
);
14161464
OTHER_LDFLAGS = (
14171465
"-ObjC",
14181466
"-lc++",
@@ -1428,9 +1476,17 @@
14281476
buildSettings = {
14291477
BUNDLE_LOADER = "$(TEST_HOST)";
14301478
COPY_PHASE_STRIP = NO;
1479+
HEADER_SEARCH_PATHS = (
1480+
"$(inherited)",
1481+
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
1482+
);
14311483
INFOPLIST_FILE = WAPITests/Info.plist;
14321484
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
14331485
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1486+
LIBRARY_SEARCH_PATHS = (
1487+
"$(inherited)",
1488+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1489+
);
14341490
OTHER_LDFLAGS = (
14351491
"-ObjC",
14361492
"-lc++",
@@ -1449,6 +1505,10 @@
14491505
CURRENT_PROJECT_VERSION = 1;
14501506
DEAD_CODE_STRIPPING = NO;
14511507
DEVELOPMENT_TEAM = 58GJTCY83M;
1508+
HEADER_SEARCH_PATHS = (
1509+
"$(inherited)",
1510+
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
1511+
);
14521512
INFOPLIST_FILE = WAPI/Info.plist;
14531513
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
14541514
OTHER_LDFLAGS = (
@@ -1470,6 +1530,10 @@
14701530
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
14711531
CURRENT_PROJECT_VERSION = 1;
14721532
DEVELOPMENT_TEAM = 58GJTCY83M;
1533+
HEADER_SEARCH_PATHS = (
1534+
"$(inherited)",
1535+
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
1536+
);
14731537
INFOPLIST_FILE = WAPI/Info.plist;
14741538
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
14751539
OTHER_LDFLAGS = (
@@ -1496,8 +1560,16 @@
14961560
DEBUG_INFORMATION_FORMAT = dwarf;
14971561
ENABLE_TESTABILITY = YES;
14981562
GCC_NO_COMMON_BLOCKS = YES;
1563+
HEADER_SEARCH_PATHS = (
1564+
"$(inherited)",
1565+
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
1566+
);
14991567
INFOPLIST_FILE = "WAPI-tvOS/Info.plist";
15001568
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1569+
LIBRARY_SEARCH_PATHS = (
1570+
"$(inherited)",
1571+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1572+
);
15011573
OTHER_LDFLAGS = (
15021574
"-ObjC",
15031575
"-lc++",
@@ -1523,8 +1595,16 @@
15231595
COPY_PHASE_STRIP = NO;
15241596
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
15251597
GCC_NO_COMMON_BLOCKS = YES;
1598+
HEADER_SEARCH_PATHS = (
1599+
"$(inherited)",
1600+
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
1601+
);
15261602
INFOPLIST_FILE = "WAPI-tvOS/Info.plist";
15271603
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1604+
LIBRARY_SEARCH_PATHS = (
1605+
"$(inherited)",
1606+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1607+
);
15281608
OTHER_LDFLAGS = (
15291609
"-ObjC",
15301610
"-lc++",
@@ -1549,8 +1629,16 @@
15491629
DEBUG_INFORMATION_FORMAT = dwarf;
15501630
ENABLE_TESTABILITY = YES;
15511631
GCC_NO_COMMON_BLOCKS = YES;
1632+
HEADER_SEARCH_PATHS = (
1633+
"$(inherited)",
1634+
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
1635+
);
15521636
INFOPLIST_FILE = "WAPI-tvOSTests/Info.plist";
15531637
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1638+
LIBRARY_SEARCH_PATHS = (
1639+
"$(inherited)",
1640+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1641+
);
15541642
OTHER_LDFLAGS = (
15551643
"-ObjC",
15561644
"-lc++",
@@ -1575,8 +1663,16 @@
15751663
COPY_PHASE_STRIP = NO;
15761664
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
15771665
GCC_NO_COMMON_BLOCKS = YES;
1666+
HEADER_SEARCH_PATHS = (
1667+
"$(inherited)",
1668+
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
1669+
);
15781670
INFOPLIST_FILE = "WAPI-tvOSTests/Info.plist";
15791671
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1672+
LIBRARY_SEARCH_PATHS = (
1673+
"$(inherited)",
1674+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1675+
);
15801676
OTHER_LDFLAGS = (
15811677
"-ObjC",
15821678
"-lc++",

‎ios/WAPI/Images.xcassets/AppIcon.appiconset/100.png‎

5 KB
Loading

‎ios/WAPI/Images.xcassets/AppIcon.appiconset/1024.png‎

138 KB
Loading

‎ios/WAPI/Images.xcassets/AppIcon.appiconset/114.png‎

5.84 KB
Loading

‎ios/WAPI/Images.xcassets/AppIcon.appiconset/120.png‎

6.22 KB
Loading

‎ios/WAPI/Images.xcassets/AppIcon.appiconset/128.png‎

6.97 KB
Loading

‎ios/WAPI/Images.xcassets/AppIcon.appiconset/144.png‎

8.25 KB
Loading

0 commit comments

Comments
 (0)