Skip to content

Commit 913ebab

Browse files
ElenaBitireElenaBitire
authored
Merge pull request #287 from obytes/fix/fixes
Fix/fixes
2 parents b894d27 + d042d4c commit 913ebab

File tree

19 files changed

+559
-550
lines changed

19 files changed

+559
-550
lines changed

‎ios/ObytesApp.xcodeproj/project.pbxproj‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,29 @@
1111
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1212
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1313
3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */; };
14+
4737D5E3A3CA48A19FD13D9E /* Inter.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F6542FF9237A4BC9BB247377 /* Inter.ttf */; };
15+
86275658D25A4D2AA1083E5E /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = 055F26355A6444F5BA123175 /* noop-file.swift */; };
1416
96905EF65AED1B983A6B3ABC /* libPods-ObytesApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-ObytesApp.a */; };
15-
A42E97E898204B12BA3A4558 /* Inter.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EBEB5C25186D4F0C9362805F /* Inter.ttf */; };
1617
B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */; };
1718
BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; };
18-
C5D6F5C152B040D192573865 /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = E06E17A4B6A34FA094D0B3C9 /* noop-file.swift */; };
1919
/* End PBXBuildFile section */
2020

2121
/* Begin PBXFileReference section */
22+
055F26355A6444F5BA123175 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "ObytesApp/noop-file.swift"; sourceTree = "<group>"; };
2223
13B07F961A680F5B00A75B9A /* ObytesApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ObytesApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
2324
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ObytesApp/AppDelegate.h; sourceTree = "<group>"; };
2425
13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = ObytesApp/AppDelegate.mm; sourceTree = "<group>"; };
2526
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ObytesApp/Images.xcassets; sourceTree = "<group>"; };
2627
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ObytesApp/Info.plist; sourceTree = "<group>"; };
2728
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ObytesApp/main.m; sourceTree = "<group>"; };
29+
3B54AAF413124180B31A1706 /* ObytesApp-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "ObytesApp-Bridging-Header.h"; path = "ObytesApp/ObytesApp-Bridging-Header.h"; sourceTree = "<group>"; };
2830
58EEBF8E8E6FB1BC6CAF49B5 /* libPods-ObytesApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ObytesApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
2931
6C2E3173556A471DD304B334 /* Pods-ObytesApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ObytesApp.debug.xcconfig"; path = "Target Support Files/Pods-ObytesApp/Pods-ObytesApp.debug.xcconfig"; sourceTree = "<group>"; };
3032
7A4D352CD337FB3A3BF06240 /* Pods-ObytesApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ObytesApp.release.xcconfig"; path = "Target Support Files/Pods-ObytesApp/Pods-ObytesApp.release.xcconfig"; sourceTree = "<group>"; };
31-
91DFF62915824559B8BF20B1 /* ObytesApp-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "ObytesApp-Bridging-Header.h"; path = "ObytesApp/ObytesApp-Bridging-Header.h"; sourceTree = "<group>"; };
3233
AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = ObytesApp/SplashScreen.storyboard; sourceTree = "<group>"; };
3334
BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = "<group>"; };
34-
E06E17A4B6A34FA094D0B3C9 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "ObytesApp/noop-file.swift"; sourceTree = "<group>"; };
35-
EBEB5C25186D4F0C9362805F /* Inter.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = Inter.ttf; path = ../assets/fonts/Inter.ttf; sourceTree = "<group>"; };
3635
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
36+
F6542FF9237A4BC9BB247377 /* Inter.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = Inter.ttf; path = ../assets/fonts/Inter.ttf; sourceTree = "<group>"; };
3737
FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-ObytesApp/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
3838
/* End PBXFileReference section */
3939

@@ -59,8 +59,8 @@
5959
13B07FB61A68108700A75B9A /* Info.plist */,
6060
13B07FB71A68108700A75B9A /* main.m */,
6161
AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */,
62-
E06E17A4B6A34FA094D0B3C9 /* noop-file.swift */,
63-
91DFF62915824559B8BF20B1 /* ObytesApp-Bridging-Header.h */,
62+
055F26355A6444F5BA123175 /* noop-file.swift */,
63+
3B54AAF413124180B31A1706 /* ObytesApp-Bridging-Header.h */,
6464
);
6565
name = ObytesApp;
6666
sourceTree = "<group>";
@@ -90,7 +90,7 @@
9090
2D16E6871FA4F8E400B85C8A /* Frameworks */,
9191
D65327D7A22EEC0BE12398D9 /* Pods */,
9292
D7E4C46ADA2E9064B798F356 /* ExpoModulesProviders */,
93-
EDC333CF465A4CCF9F5C730C /* Resources */,
93+
A3B66ED490934E8CA7C419F6 /* Resources */,
9494
);
9595
indentWidth = 2;
9696
sourceTree = "<group>";
@@ -113,6 +113,15 @@
113113
name = ObytesApp;
114114
sourceTree = "<group>";
115115
};
116+
A3B66ED490934E8CA7C419F6 /* Resources */ = {
117+
isa = PBXGroup;
118+
children = (
119+
F6542FF9237A4BC9BB247377 /* Inter.ttf */,
120+
);
121+
name = Resources;
122+
path = "";
123+
sourceTree = "<group>";
124+
};
116125
BB2F792B24A3F905000567C9 /* Supporting */ = {
117126
isa = PBXGroup;
118127
children = (
@@ -139,15 +148,6 @@
139148
name = ExpoModulesProviders;
140149
sourceTree = "<group>";
141150
};
142-
EDC333CF465A4CCF9F5C730C /* Resources */ = {
143-
isa = PBXGroup;
144-
children = (
145-
EBEB5C25186D4F0C9362805F /* Inter.ttf */,
146-
);
147-
name = Resources;
148-
path = "";
149-
sourceTree = "<group>";
150-
};
151151
/* End PBXGroup section */
152152

153153
/* Begin PBXNativeTarget section */
@@ -156,13 +156,13 @@
156156
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "ObytesApp" */;
157157
buildPhases = (
158158
08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */,
159-
AE7CB89C86A92C7F344E0F4F /* [Expo] Configure project */,
159+
E2B1F1E6EC5774A947E4AF47 /* [Expo] Configure project */,
160160
13B07F871A680F5B00A75B9A /* Sources */,
161161
13B07F8C1A680F5B00A75B9A /* Frameworks */,
162162
13B07F8E1A680F5B00A75B9A /* Resources */,
163163
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
164164
800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */,
165-
C053EEDA47B262D34A0425CC /* [CP] Embed Pods Frameworks */,
165+
B653CAF31F291B9EFA7B2A31 /* [CP] Embed Pods Frameworks */,
166166
);
167167
buildRules = (
168168
);
@@ -212,7 +212,7 @@
212212
BB2F792D24A3F905000567C9 /* Expo.plist in Resources */,
213213
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
214214
3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */,
215-
A42E97E898204B12BA3A4558 /* Inter.ttf in Resources */,
215+
4737D5E3A3CA48A19FD13D9E /* Inter.ttf in Resources */,
216216
);
217217
runOnlyForDeploymentPostprocessing = 0;
218218
};
@@ -280,42 +280,42 @@
280280
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ObytesApp/Pods-ObytesApp-resources.sh\"\n";
281281
showEnvVarsInLog = 0;
282282
};
283-
AE7CB89C86A92C7F344E0F4F /* [Expo] Configure project */ = {
283+
B653CAF31F291B9EFA7B2A31 /* [CP] Embed Pods Frameworks */ = {
284284
isa = PBXShellScriptBuildPhase;
285-
alwaysOutOfDate = 1;
286285
buildActionMask = 2147483647;
287286
files = (
288287
);
289-
inputFileListPaths = (
290-
);
291288
inputPaths = (
289+
"${PODS_ROOT}/Target Support Files/Pods-ObytesApp/Pods-ObytesApp-frameworks.sh",
290+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
292291
);
293-
name = "[Expo] Configure project";
294-
outputFileListPaths = (
295-
);
292+
name = "[CP] Embed Pods Frameworks";
296293
outputPaths = (
294+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
297295
);
298296
runOnlyForDeploymentPostprocessing = 0;
299297
shellPath = /bin/sh;
300-
shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-ObytesApp/expo-configure-project.sh\"\n";
298+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ObytesApp/Pods-ObytesApp-frameworks.sh\"\n";
299+
showEnvVarsInLog = 0;
301300
};
302-
C053EEDA47B262D34A0425CC /* [CP] Embed Pods Frameworks */ = {
301+
E2B1F1E6EC5774A947E4AF47 /* [Expo] Configure project */ = {
303302
isa = PBXShellScriptBuildPhase;
303+
alwaysOutOfDate = 1;
304304
buildActionMask = 2147483647;
305305
files = (
306306
);
307+
inputFileListPaths = (
308+
);
307309
inputPaths = (
308-
"${PODS_ROOT}/Target Support Files/Pods-ObytesApp/Pods-ObytesApp-frameworks.sh",
309-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
310310
);
311-
name = "[CP] Embed Pods Frameworks";
311+
name = "[Expo] Configure project";
312+
outputFileListPaths = (
313+
);
312314
outputPaths = (
313-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
314315
);
315316
runOnlyForDeploymentPostprocessing = 0;
316317
shellPath = /bin/sh;
317-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ObytesApp/Pods-ObytesApp-frameworks.sh\"\n";
318-
showEnvVarsInLog = 0;
318+
shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-ObytesApp/expo-configure-project.sh\"\n";
319319
};
320320
/* End PBXShellScriptBuildPhase section */
321321

@@ -327,7 +327,7 @@
327327
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
328328
13B07FC11A68108700A75B9A /* main.m in Sources */,
329329
B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */,
330-
C5D6F5C152B040D192573865 /* noop-file.swift in Sources */,
330+
86275658D25A4D2AA1083E5E /* noop-file.swift in Sources */,
331331
);
332332
runOnlyForDeploymentPostprocessing = 0;
333333
};
@@ -358,7 +358,7 @@
358358
);
359359
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
360360
PRODUCT_BUNDLE_IDENTIFIER = com.obytes.development;
361-
PRODUCT_NAME = "ObytesApp";
361+
PRODUCT_NAME = ObytesApp;
362362
SWIFT_OBJC_BRIDGING_HEADER = "ObytesApp/ObytesApp-Bridging-Header.h";
363363
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
364364
SWIFT_VERSION = 5.0;
@@ -386,7 +386,7 @@
386386
);
387387
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
388388
PRODUCT_BUNDLE_IDENTIFIER = com.obytes.development;
389-
PRODUCT_NAME = "ObytesApp";
389+
PRODUCT_NAME = ObytesApp;
390390
SWIFT_OBJC_BRIDGING_HEADER = "ObytesApp/ObytesApp-Bridging-Header.h";
391391
SWIFT_VERSION = 5.0;
392392
TARGETED_DEVICE_FAMILY = "1,2";

0 commit comments

Comments
 (0)