Skip to content

Commit c8598fe

Browse files
ThatXlinerThatXliner
committed
ok.. fix?
1 parent 9bcec91 commit c8598fe

File tree

5 files changed

+37
-43
lines changed

5 files changed

+37
-43
lines changed

‎apps/WarriorHappy/app.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"expo": {
33
"name": "WarriorHappy",
44
"slug": "WarriorHappy",
5-
"version": "3.2.6",
5+
"version": "3.2.9",
66
"orientation": "portrait",
77
"icon": "./assets/images/icon.png",
88
"scheme": "myapp",

‎apps/WarriorHappy/ios/WarriorHappy.xcodeproj/project.pbxproj

+33-39
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@
1010
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
1111
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1212
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
13+
2F53F93B9093F32467BCC74B /* Pods_WarriorHappy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20C8C33A0629424661F49245 /* Pods_WarriorHappy.framework */; };
1314
3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */; };
15+
A6D903A1EECD4317AEAA7C55 /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED21AB9AE2AE40DEBDB83560 /* noop-file.swift */; };
1416
B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */; };
1517
BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; };
16-
BB8CF2364EF016A1C6360E3E /* Pods_WarriorHappy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60834D0BB7D8E1C8A64DA952 /* Pods_WarriorHappy.framework */; };
17-
D6B97C0E0A0F4CF3A7BE66B1 /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6427116BF1B47DDB82927F2 /* noop-file.swift */; };
1818
/* End PBXBuildFile section */
1919

2020
/* Begin PBXFileReference section */
21-
08F36556ACAB47AF9B587DDA /* WarriorHappy-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "WarriorHappy-Bridging-Header.h"; path = "WarriorHappy/WarriorHappy-Bridging-Header.h"; sourceTree = "<group>"; };
2221
13B07F961A680F5B00A75B9A /* WarriorHappy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WarriorHappy.app; sourceTree = BUILT_PRODUCTS_DIR; };
2322
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = WarriorHappy/AppDelegate.h; sourceTree = "<group>"; };
2423
13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = WarriorHappy/AppDelegate.mm; sourceTree = "<group>"; };
2524
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = WarriorHappy/Images.xcassets; sourceTree = "<group>"; };
2625
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = WarriorHappy/Info.plist; sourceTree = "<group>"; };
2726
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = WarriorHappy/main.m; sourceTree = "<group>"; };
28-
60834D0BB7D8E1C8A64DA952 /* Pods_WarriorHappy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WarriorHappy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
27+
20C8C33A0629424661F49245 /* Pods_WarriorHappy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WarriorHappy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
28+
3523349619EF4E7CA14BDBB7 /* WarriorHappy-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "WarriorHappy-Bridging-Header.h"; path = "WarriorHappy/WarriorHappy-Bridging-Header.h"; sourceTree = "<group>"; };
2929
6C2E3173556A471DD304B334 /* Pods-WarriorHappy.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WarriorHappy.debug.xcconfig"; path = "Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy.debug.xcconfig"; sourceTree = "<group>"; };
3030
7A4D352CD337FB3A3BF06240 /* Pods-WarriorHappy.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WarriorHappy.release.xcconfig"; path = "Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy.release.xcconfig"; sourceTree = "<group>"; };
3131
AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = WarriorHappy/SplashScreen.storyboard; sourceTree = "<group>"; };
3232
BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = "<group>"; };
33-
D6427116BF1B47DDB82927F2 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "WarriorHappy/noop-file.swift"; sourceTree = "<group>"; };
33+
ED21AB9AE2AE40DEBDB83560 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "WarriorHappy/noop-file.swift"; sourceTree = "<group>"; };
3434
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
3535
FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-WarriorHappy/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
3636
/* End PBXFileReference section */
@@ -40,7 +40,7 @@
4040
isa = PBXFrameworksBuildPhase;
4141
buildActionMask = 2147483647;
4242
files = (
43-
BB8CF2364EF016A1C6360E3E /* Pods_WarriorHappy.framework in Frameworks */,
43+
2F53F93B9093F32467BCC74B /* Pods_WarriorHappy.framework in Frameworks */,
4444
);
4545
runOnlyForDeploymentPostprocessing = 0;
4646
};
@@ -57,8 +57,8 @@
5757
13B07FB61A68108700A75B9A /* Info.plist */,
5858
13B07FB71A68108700A75B9A /* main.m */,
5959
AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */,
60-
D6427116BF1B47DDB82927F2 /* noop-file.swift */,
61-
08F36556ACAB47AF9B587DDA /* WarriorHappy-Bridging-Header.h */,
60+
ED21AB9AE2AE40DEBDB83560 /* noop-file.swift */,
61+
3523349619EF4E7CA14BDBB7 /* WarriorHappy-Bridging-Header.h */,
6262
);
6363
name = WarriorHappy;
6464
sourceTree = "<group>";
@@ -67,7 +67,7 @@
6767
isa = PBXGroup;
6868
children = (
6969
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
70-
60834D0BB7D8E1C8A64DA952 /* Pods_WarriorHappy.framework */,
70+
20C8C33A0629424661F49245 /* Pods_WarriorHappy.framework */,
7171
);
7272
name = Frameworks;
7373
sourceTree = "<group>";
@@ -144,13 +144,13 @@
144144
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "WarriorHappy" */;
145145
buildPhases = (
146146
08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */,
147-
4514466D35DCF37594EC8B89 /* [Expo] Configure project */,
147+
452726F0B476C14D8D205B1B /* [Expo] Configure project */,
148148
13B07F871A680F5B00A75B9A /* Sources */,
149149
13B07F8C1A680F5B00A75B9A /* Frameworks */,
150150
13B07F8E1A680F5B00A75B9A /* Resources */,
151151
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
152152
800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */,
153-
00A2A45CAA20FF2AA848075D /* [CP] Embed Pods Frameworks */,
153+
0A23AC4C866D5B13F8406298 /* [CP] Embed Pods Frameworks */,
154154
);
155155
buildRules = (
156156
);
@@ -206,24 +206,6 @@
206206
/* End PBXResourcesBuildPhase section */
207207

208208
/* Begin PBXShellScriptBuildPhase section */
209-
00A2A45CAA20FF2AA848075D /* [CP] Embed Pods Frameworks */ = {
210-
isa = PBXShellScriptBuildPhase;
211-
buildActionMask = 2147483647;
212-
files = (
213-
);
214-
inputPaths = (
215-
"${PODS_ROOT}/Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy-frameworks.sh",
216-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
217-
);
218-
name = "[CP] Embed Pods Frameworks";
219-
outputPaths = (
220-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
221-
);
222-
runOnlyForDeploymentPostprocessing = 0;
223-
shellPath = /bin/sh;
224-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy-frameworks.sh\"\n";
225-
showEnvVarsInLog = 0;
226-
};
227209
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */ = {
228210
isa = PBXShellScriptBuildPhase;
229211
alwaysOutOfDate = 1;
@@ -261,7 +243,25 @@
261243
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
262244
showEnvVarsInLog = 0;
263245
};
264-
4514466D35DCF37594EC8B89 /* [Expo] Configure project */ = {
246+
0A23AC4C866D5B13F8406298 /* [CP] Embed Pods Frameworks */ = {
247+
isa = PBXShellScriptBuildPhase;
248+
buildActionMask = 2147483647;
249+
files = (
250+
);
251+
inputPaths = (
252+
"${PODS_ROOT}/Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy-frameworks.sh",
253+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
254+
);
255+
name = "[CP] Embed Pods Frameworks";
256+
outputPaths = (
257+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
258+
);
259+
runOnlyForDeploymentPostprocessing = 0;
260+
shellPath = /bin/sh;
261+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy-frameworks.sh\"\n";
262+
showEnvVarsInLog = 0;
263+
};
264+
452726F0B476C14D8D205B1B /* [Expo] Configure project */ = {
265265
isa = PBXShellScriptBuildPhase;
266266
alwaysOutOfDate = 1;
267267
buildActionMask = 2147483647;
@@ -310,7 +310,7 @@
310310
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
311311
13B07FC11A68108700A75B9A /* main.m in Sources */,
312312
B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */,
313-
D6B97C0E0A0F4CF3A7BE66B1 /* noop-file.swift in Sources */,
313+
A6D903A1EECD4317AEAA7C55 /* noop-file.swift in Sources */,
314314
);
315315
runOnlyForDeploymentPostprocessing = 0;
316316
};
@@ -454,10 +454,7 @@
454454
ONLY_ACTIVE_ARCH = YES;
455455
OTHER_CFLAGS = "$(inherited)";
456456
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
457-
OTHER_LDFLAGS = (
458-
"$(inherited)",
459-
" ",
460-
);
457+
OTHER_LDFLAGS = "$(inherited) ";
461458
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
462459
SDKROOT = iphoneos;
463460
USE_HERMES = true;
@@ -525,10 +522,7 @@
525522
MTL_ENABLE_DEBUG_INFO = NO;
526523
OTHER_CFLAGS = "$(inherited)";
527524
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
528-
OTHER_LDFLAGS = (
529-
"$(inherited)",
530-
" ",
531-
);
525+
OTHER_LDFLAGS = "$(inherited) ";
532526
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
533527
SDKROOT = iphoneos;
534528
USE_HERMES = true;

‎apps/WarriorHappy/ios/WarriorHappy/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundlePackageType</key>
2222
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
2323
<key>CFBundleShortVersionString</key>
24-
<string>3.2.6</string>
24+
<string>3.2.9</string>
2525
<key>CFBundleSignature</key>
2626
<string>????</string>
2727
<key>CFBundleURLTypes</key>

‎apps/WarriorHappy/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "warriorhappy",
33
"main": "index.ts",
4-
"version": "3.2.6",
4+
"version": "3.2.9",
55
"scripts": {
66
"start": "expo start",
77
"android": "expo run:android",

‎apps/WarriorHappy/src/app/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ export default function HomeScreen() {
395395
// biome-ignore lint/correctness/useExhaustiveDependencies: <explanation>
396396
useEffect(() => {
397397
if (isFetched && matchScoutAssignments) {
398-
setVal(matchScoutAssignments[0][0]?.eventName);
398+
setVal(matchScoutAssignments?.[0]?.[0]?.eventName);
399399
}
400400
}, [isFetched]);
401401
const filteredByEvent = useMemo(

0 commit comments

Comments
 (0)