Skip to content

Commit 7b40601

Browse files
CommanderRedYTCommanderRedYT
committed
Finally fix building
1 parent 652ca70 commit 7b40601

File tree

5 files changed

+137
-153
lines changed

5 files changed

+137
-153
lines changed

‎ios/Podfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ PODS:
88
- DoubleConversion (1.1.6)
99
- EXConstants (17.0.8):
1010
- ExpoModulesCore
11-
- Expo (52.0.46):
11+
- Expo (52.0.27):
1212
- ExpoModulesCore
13-
- ExpoModulesCore (2.2.3):
13+
- ExpoModulesCore (2.1.4):
1414
- DoubleConversion
1515
- glog
1616
- hermes-engine
@@ -2291,8 +2291,8 @@ SPEC CHECKSUMS:
22912291
DGCharts: 6e0cf2644e8f81ad13f04caa8bc18502870a1c54
22922292
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
22932293
EXConstants: a1f35b9aabbb3c6791f8e67722579b1ffcdd3f18
2294-
Expo: 3e53243e3281214a7d613f8a875c0b732d7512c2
2295-
ExpoModulesCore: 99d5de91c92f514765d101d1e4988a5f387995e8
2294+
Expo: 7021c4880d0bbd02781e88e213b6786c1200ebdf
2295+
ExpoModulesCore: 0c6ccf07837d7fb78c1ff320229efcb8dc935424
22962296
fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6
22972297
FBLazyVector: 2bc03a5cf64e29c611bbc5d7eb9d9f7431f37ee6
22982298
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
@@ -2384,6 +2384,6 @@ SPEC CHECKSUMS:
23842384
SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
23852385
Yoga: 78d74e245ed67bb94275a1316cdc170b9b7fe884
23862386

2387-
PODFILE CHECKSUM: 57716f8a03eff655b12cbeac63118fce21c860fb
2387+
PODFILE CHECKSUM: 236a2187fcbe084e16792ff6d57013e36a11638e
23882388

23892389
COCOAPODS: 1.15.2

‎ios/opendtureactnative.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
0C80B921A6F3F58F76C31292 /* libPods-opendtureactnative.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-opendtureactnative.a */; };
1111
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
12-
209489E8495EA5503CEBDC56 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = C68F04B6D088F78FFD85E60D /* ExpoModulesProvider.swift */; };
1312
4BB71F1CA90CCB0895A5865F /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F0730B7B8DC7A76826F00B /* ExpoModulesProvider.swift */; };
14-
761780ED2CA45674006654EE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 761780EC2CA45674006654EE /* AppDelegate.swift */; };
1513
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
1614
BC0323ED2C30AEC2008EA82D /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BC0323D92C30AEC2008EA82D /* AntDesign.ttf */; };
1715
BC0323EE2C30AEC2008EA82D /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BC0323DA2C30AEC2008EA82D /* Entypo.ttf */; };
@@ -32,21 +30,11 @@
3230
BC0323FD2C30AEC2008EA82D /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BC0323E92C30AEC2008EA82D /* Octicons.ttf */; };
3331
BC0323FE2C30AEC2008EA82D /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BC0323EA2C30AEC2008EA82D /* SimpleLineIcons.ttf */; };
3432
BC0323FF2C30AEC2008EA82D /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BC0323EB2C30AEC2008EA82D /* Zocial.ttf */; };
33+
BCC3241C2E182F5200DC4E5C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCC3241B2E182F5200DC4E5C /* AppDelegate.swift */; };
3534
D05C19C6DAB4887AF429D910 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 9597EE690EBB25B615F74D50 /* PrivacyInfo.xcprivacy */; };
3635
/* End PBXBuildFile section */
3736

38-
/* Begin PBXContainerItemProxy section */
39-
00E356F41AD99517003FC87E /* PBXContainerItemProxy */ = {
40-
isa = PBXContainerItemProxy;
41-
containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
42-
proxyType = 1;
43-
remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
44-
remoteInfo = opendtureactnative;
45-
};
46-
/* End PBXContainerItemProxy section */
47-
4837
/* Begin PBXFileReference section */
49-
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5038
13B07F961A680F5B00A75B9A /* opendtureactnative.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = opendtureactnative.app; sourceTree = BUILT_PRODUCTS_DIR; };
5139
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = opendtureactnative/Images.xcassets; sourceTree = "<group>"; };
5240
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = opendtureactnative/Info.plist; sourceTree = "<group>"; };
@@ -55,7 +43,6 @@
5543
3B4392A12AC88292D35C810B /* Pods-opendtureactnative.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-opendtureactnative.debug.xcconfig"; path = "Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative.debug.xcconfig"; sourceTree = "<group>"; };
5644
5709B34CF0A7D63546082F79 /* Pods-opendtureactnative.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-opendtureactnative.release.xcconfig"; path = "Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative.release.xcconfig"; sourceTree = "<group>"; };
5745
5DCACB8F33CDC322A6C60F78 /* libPods-opendtureactnative.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-opendtureactnative.a"; sourceTree = BUILT_PRODUCTS_DIR; };
58-
761780EC2CA45674006654EE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = RnDiffApp/AppDelegate.swift; sourceTree = "<group>"; };
5946
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = opendtureactnative/LaunchScreen.storyboard; sourceTree = "<group>"; };
6047
9597EE690EBB25B615F74D50 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = opendtureactnative/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
6148
BC0323D92C30AEC2008EA82D /* AntDesign.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = AntDesign.ttf; sourceTree = "<group>"; };
@@ -77,6 +64,7 @@
7764
BC0323E92C30AEC2008EA82D /* Octicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Octicons.ttf; sourceTree = "<group>"; };
7865
BC0323EA2C30AEC2008EA82D /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = SimpleLineIcons.ttf; sourceTree = "<group>"; };
7966
BC0323EB2C30AEC2008EA82D /* Zocial.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Zocial.ttf; sourceTree = "<group>"; };
67+
BCC3241B2E182F5200DC4E5C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = opendtureactnative/AppDelegate.swift; sourceTree = "<group>"; };
8068
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
8169
/* End PBXFileReference section */
8270

@@ -92,20 +80,11 @@
9280
/* End PBXFrameworksBuildPhase section */
9381

9482
/* Begin PBXGroup section */
95-
00E356F01AD99517003FC87E /* Supporting Files */ = {
96-
isa = PBXGroup;
97-
children = (
98-
00E356F11AD99517003FC87E /* Info.plist */,
99-
);
100-
name = "Supporting Files";
101-
sourceTree = "<group>";
102-
};
10383
13B07FAE1A68108700A75B9A /* opendtureactnative */ = {
10484
isa = PBXGroup;
10585
children = (
10686
BC0323EC2C30AEC2008EA82D /* Fonts */,
10787
13B07FB51A68108700A75B9A /* Images.xcassets */,
108-
761780EC2CA45674006654EE /* AppDelegate.swift */,
10988
13B07FB61A68108700A75B9A /* Info.plist */,
11089
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
11190
13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */,
@@ -147,6 +126,7 @@
147126
2D16E6871FA4F8E400B85C8A /* Frameworks */,
148127
BBD78D7AC51CEA395F1C20DB /* Pods */,
149128
4BBB371F6823D49174FD75A6 /* ExpoModulesProviders */,
129+
BCC3241B2E182F5200DC4E5C /* AppDelegate.swift */,
150130
);
151131
indentWidth = 2;
152132
sourceTree = "<group>";
@@ -263,13 +243,6 @@
263243
/* End PBXProject section */
264244

265245
/* Begin PBXResourcesBuildPhase section */
266-
00E356EC1AD99517003FC87E /* Resources */ = {
267-
isa = PBXResourcesBuildPhase;
268-
buildActionMask = 2147483647;
269-
files = (
270-
);
271-
runOnlyForDeploymentPostprocessing = 0;
272-
};
273246
13B07F8E1A680F5B00A75B9A /* Resources */ = {
274247
isa = PBXResourcesBuildPhase;
275248
buildActionMask = 2147483647;
@@ -326,10 +299,14 @@
326299
inputFileListPaths = (
327300
"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-frameworks-${CONFIGURATION}-input-files.xcfilelist",
328301
);
302+
inputPaths = (
303+
);
329304
name = "[CP] Embed Pods Frameworks";
330305
outputFileListPaths = (
331306
"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-frameworks-${CONFIGURATION}-output-files.xcfilelist",
332307
);
308+
outputPaths = (
309+
);
333310
runOnlyForDeploymentPostprocessing = 0;
334311
shellPath = /bin/sh;
335312
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-frameworks.sh\"\n";
@@ -384,10 +361,14 @@
384361
inputFileListPaths = (
385362
"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-resources-${CONFIGURATION}-input-files.xcfilelist",
386363
);
364+
inputPaths = (
365+
);
387366
name = "[CP] Copy Pods Resources";
388367
outputFileListPaths = (
389368
"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-resources-${CONFIGURATION}-output-files.xcfilelist",
390369
);
370+
outputPaths = (
371+
);
391372
runOnlyForDeploymentPostprocessing = 0;
392373
shellPath = /bin/sh;
393374
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-resources.sh\"\n";
@@ -396,33 +377,17 @@
396377
/* End PBXShellScriptBuildPhase section */
397378

398379
/* Begin PBXSourcesBuildPhase section */
399-
00E356EA1AD99517003FC87E /* Sources */ = {
400-
isa = PBXSourcesBuildPhase;
401-
buildActionMask = 2147483647;
402-
files = (
403-
209489E8495EA5503CEBDC56 /* ExpoModulesProvider.swift in Sources */,
404-
);
405-
runOnlyForDeploymentPostprocessing = 0;
406-
};
407380
13B07F871A680F5B00A75B9A /* Sources */ = {
408381
isa = PBXSourcesBuildPhase;
409382
buildActionMask = 2147483647;
410383
files = (
411-
761780ED2CA45674006654EE /* AppDelegate.swift in Sources */,
384+
BCC3241C2E182F5200DC4E5C /* AppDelegate.swift in Sources */,
412385
4BB71F1CA90CCB0895A5865F /* ExpoModulesProvider.swift in Sources */,
413386
);
414387
runOnlyForDeploymentPostprocessing = 0;
415388
};
416389
/* End PBXSourcesBuildPhase section */
417390

418-
/* Begin PBXTargetDependency section */
419-
00E356F51AD99517003FC87E /* PBXTargetDependency */ = {
420-
isa = PBXTargetDependency;
421-
target = 13B07F861A680F5B00A75B9A /* opendtureactnative */;
422-
targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */;
423-
};
424-
/* End PBXTargetDependency section */
425-
426391
/* Begin XCBuildConfiguration section */
427392
13B07F941A680F5B00A75B9A /* Debug */ = {
428393
isa = XCBuildConfiguration;
@@ -531,7 +496,7 @@
531496
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
532497
PRODUCT_NAME = opendtureactnative;
533498
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
534-
SWIFT_VERSION = 6.0;
499+
SWIFT_VERSION = 5.0;
535500
VERSIONING_SYSTEM = "apple-generic";
536501
};
537502
name = Debug;
@@ -641,7 +606,7 @@
641606
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
642607
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
643608
PRODUCT_NAME = opendtureactnative;
644-
SWIFT_VERSION = 6.0;
609+
SWIFT_VERSION = 5.0;
645610
VERSIONING_SYSTEM = "apple-generic";
646611
};
647612
name = Release;
@@ -721,10 +686,7 @@
721686
"-DFOLLY_CFG_NO_COROUTINES=1",
722687
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
723688
);
724-
OTHER_LDFLAGS = (
725-
"$(inherited)",
726-
" ",
727-
);
689+
OTHER_LDFLAGS = "$(inherited) ";
728690
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
729691
SDKROOT = iphoneos;
730692
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -799,10 +761,7 @@
799761
"-DFOLLY_CFG_NO_COROUTINES=1",
800762
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
801763
);
802-
OTHER_LDFLAGS = (
803-
"$(inherited)",
804-
" ",
805-
);
764+
OTHER_LDFLAGS = "$(inherited) ";
806765
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
807766
SDKROOT = iphoneos;
808767
SWIFT_COMPILATION_MODE = wholemodule;

‎licenses.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"licenseUrl": "https://github.com/omichelsen/compare-versions/raw/master/LICENSE",
8484
"parents": "opendtu-react-native"
8585
},
86-
"[email protected].46": {
86+
"[email protected].27": {
8787
"licenses": "MIT",
8888
"repository": "https://github.com/expo/expo",
8989
"licenseUrl": "https://github.com/expo/expo",

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@shopify/flash-list": "^1.8.3",
4747
"base-64": "^1.0.0",
4848
"compare-versions": "^6.1.1",
49-
"expo": "52.0.46",
49+
"expo": "52.0.27",
5050
"fast-deep-equal": "^3.1.3",
5151
"fuse.js": "^7.1.0",
5252
"i18next": "^25.3.0",

0 commit comments

Comments
 (0)