Skip to content

Commit

Permalink
chore: Testflight rebase
Browse files Browse the repository at this point in the history 
Rebased testflight branch
Removed unused files from bad merge
Renamed references
Renamed files
Updated file paths
  • Loading branch information
Alex Risch authored and Alex Risch committed May 22, 2024
1 parent a4c3caa commit ccb608d
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 29 deletions.
22 changes: 15 additions & 7 deletions ios/EphemeraMobileChat.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
5709B34CF0A7D63546082F79 /* Pods-EphemeraMobileChat.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EphemeraMobileChat.release.xcconfig"; path = "Target Support Files/Pods-EphemeraMobileChat/Pods-EphemeraMobileChat.release.xcconfig"; sourceTree = "<group>"; };
5B7EB9410499542E8C5724F5 /* Pods-EphemeraMobileChat-EphemeraMobileChatTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EphemeraMobileChat-EphemeraMobileChatTests.debug.xcconfig"; path = "Target Support Files/Pods-EphemeraMobileChat-EphemeraMobileChatTests/Pods-EphemeraMobileChat-EphemeraMobileChatTests.debug.xcconfig"; sourceTree = "<group>"; };
5DCACB8F33CDC322A6C60F78 /* libPods-EphemeraMobileChat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-EphemeraMobileChat.a"; sourceTree = BUILT_PRODUCTS_DIR; };
638ED9502B7D419B009F369B /* Assests.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assests.xcassets; path = XmtpMobileChat/Assests.xcassets; sourceTree = "<group>"; };
638ED9522B7D4755009F369B /* XmtpMobileChat.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = XmtpMobileChat.entitlements; path = XmtpMobileChat/XmtpMobileChat.entitlements; sourceTree = "<group>"; };
638ED9502B7D419B009F369B /* Assests.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assests.xcassets; path = EphemeraMobileChat/Assests.xcassets; sourceTree = "<group>"; };
638ED9522B7D4755009F369B /* EphemeraMobileChat.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = EphemeraMobileChat.entitlements; path = EphemeraMobileChat/EphemeraMobileChat.entitlements; sourceTree = "<group>"; };
78611DF31EED3FF745D00249 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-EphemeraMobileChat/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = EphemeraMobileChat/LaunchScreen.storyboard; sourceTree = "<group>"; };
89C6BE57DB24E9ADA2F236DE /* Pods-EphemeraMobileChat-EphemeraMobileChatTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EphemeraMobileChat-EphemeraMobileChatTests.release.xcconfig"; path = "Target Support Files/Pods-EphemeraMobileChat-EphemeraMobileChatTests/Pods-EphemeraMobileChat-EphemeraMobileChatTests.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -93,7 +93,7 @@
13B07FAE1A68108700A75B9A /* EphemeraMobileChat */ = {
isa = PBXGroup;
children = (
638ED9522B7D4755009F369B /* XmtpMobileChat.entitlements */,
638ED9522B7D4755009F369B /* EphemeraMobileChat.entitlements */,
13B07FAF1A68108700A75B9A /* AppDelegate.h */,
13B07FB01A68108700A75B9A /* AppDelegate.mm */,
13B07FB51A68108700A75B9A /* Images.xcassets */,
Expand Down Expand Up @@ -547,7 +547,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = XmtpMobileChat/XmtpMobileChat.entitlements;
CODE_SIGN_ENTITLEMENTS = EphemeraMobileChat/EphemeraMobileChat.entitlements;
CURRENT_PROJECT_VERSION = 20;
DEVELOPMENT_TEAM = FY4NZR34Z3;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -579,7 +579,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = EphemeraMobileChat/XmtpMobileChat.entitlements;
CODE_SIGN_ENTITLEMENTS = EphemeraMobileChat/EphemeraMobileChat.entitlements;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = FY4NZR34Z3;
INFOPLIST_FILE = EphemeraMobileChat/Info.plist;
Expand Down Expand Up @@ -672,7 +672,11 @@
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
);
OTHER_LDFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -741,7 +745,11 @@
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
);
OTHER_LDFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_VERSION = 5.0;
Expand Down
0 ...eraMobileChat/XmtpMobileChat.entitlements → ...obileChat/EphemeraMobileChat.entitlements
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ios/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1669,8 +1669,8 @@ SPEC CHECKSUMS:
web3.swift: 2263d1e12e121b2c42ffb63a5a7beb1acaf33959
XMTP: 00fe090825e6bc5991870c1925befc06b1a30b78
XMTPReactNative: cf4227bf733870dc0331f3925cea852cafd43928
Yoga: e5b887426cee15d2a326bdd34afc0282fc0486ad
Yoga: 2a16e58450c48e110211dae1159fb114bbcdcfc0

PODFILE CHECKSUM: 605f5beea10db7b4d01fe2949787bef356832da3

COCOAPODS: 1.15.2
COCOAPODS: 1.14.3
Binary file removed ios/XmtpMobileChat/Assests.xcassets/AppIcon.appiconset/App Icon.png
View file
Binary file not shown.
14 changes: 0 additions & 14 deletions ios/XmtpMobileChat/Assests.xcassets/AppIcon.appiconset/Contents.json
View file

This file was deleted.

6 changes: 0 additions & 6 deletions ios/XmtpMobileChat/Assests.xcassets/Contents.json
View file

This file was deleted.

0 comments on commit ccb608d

Please sign in to comment.