Skip to content

Commit

Permalink
After updating your Podfile and configuring your iOS simulator to work
Browse files Browse the repository at this point in the history
  • Loading branch information
@dharding
dharding committed Jul 8, 2021
1 parent 197ecd3 commit 33eb76b
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 50 deletions.
10 changes: 8 additions & 2 deletions ReactNativeOnM1/ios/Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,15 @@ target 'ReactNativeOnM1' do
#
# Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable the next line.
use_flipper!()
use_flipper!({ 'Flipper' => '0.91.1', 'Flipper-Folly' => '~> 2.6', 'Flipper-RSocket' => '~> 1.4' })

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings["ONLY_ACTIVE_ARCH"] = "NO"
end
end
flipper_post_install(installer)
react_native_post_install(installer)
end
end
end
110 changes: 64 additions & 46 deletions ReactNativeOnM1/ios/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,50 +10,64 @@ PODS:
- React-Core (= 0.64.1)
- React-jsi (= 0.64.1)
- ReactCommon/turbomodule/core (= 0.64.1)
- Flipper (0.75.1):
- Flipper-Folly (~> 2.5)
- Flipper-RSocket (~> 1.3)
- Flipper (0.91.1):
- Flipper-Folly (~> 2.6)
- Flipper-RSocket (~> 1.4)
- Flipper-Boost-iOSX (1.76.0.1.11)
- Flipper-DoubleConversion (1.1.7)
- Flipper-Folly (2.5.3):
- boost-for-react-native
- Flipper-Fmt (7.1.7)
- Flipper-Folly (2.6.7):
- Flipper-Boost-iOSX
- Flipper-DoubleConversion
- Flipper-Fmt (= 7.1.7)
- Flipper-Glog
- libevent (~> 2.1.12)
- OpenSSL-Universal (= 1.1.180)
- Flipper-Glog (0.3.6)
- Flipper-PeerTalk (0.0.4)
- Flipper-RSocket (1.3.1):
- Flipper-Folly (~> 2.5)
- FlipperKit (0.75.1):
- FlipperKit/Core (= 0.75.1)
- FlipperKit/Core (0.75.1):
- Flipper (~> 0.75.1)
- Flipper-RSocket (1.4.3):
- Flipper-Folly (~> 2.6)
- FlipperKit (0.91.1):
- FlipperKit/Core (= 0.91.1)
- FlipperKit/Core (0.91.1):
- Flipper (~> 0.91.1)
- FlipperKit/CppBridge
- FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines
- FlipperKit/FKPortForwarding
- FlipperKit/CppBridge (0.75.1):
- Flipper (~> 0.75.1)
- FlipperKit/FBCxxFollyDynamicConvert (0.75.1):
- Flipper-Folly (~> 2.5)
- FlipperKit/FBDefines (0.75.1)
- FlipperKit/FKPortForwarding (0.75.1):
- FlipperKit/CppBridge (0.91.1):
- Flipper (~> 0.91.1)
- FlipperKit/FBCxxFollyDynamicConvert (0.91.1):
- Flipper-Folly (~> 2.6)
- FlipperKit/FBDefines (0.91.1)
- FlipperKit/FKPortForwarding (0.91.1):
- CocoaAsyncSocket (~> 7.6)
- Flipper-PeerTalk (~> 0.0.4)
- FlipperKit/FlipperKitHighlightOverlay (0.75.1)
- FlipperKit/FlipperKitLayoutPlugin (0.75.1):
- FlipperKit/FlipperKitHighlightOverlay (0.91.1)
- FlipperKit/FlipperKitLayoutHelpers (0.91.1):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutTextSearchable
- FlipperKit/FlipperKitLayoutIOSDescriptors (0.91.1):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers
- YogaKit (~> 1.18)
- FlipperKit/FlipperKitLayoutPlugin (0.91.1):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers
- FlipperKit/FlipperKitLayoutIOSDescriptors
- FlipperKit/FlipperKitLayoutTextSearchable
- YogaKit (~> 1.18)
- FlipperKit/FlipperKitLayoutTextSearchable (0.75.1)
- FlipperKit/FlipperKitNetworkPlugin (0.75.1):
- FlipperKit/FlipperKitLayoutTextSearchable (0.91.1)
- FlipperKit/FlipperKitNetworkPlugin (0.91.1):
- FlipperKit/Core
- FlipperKit/FlipperKitReactPlugin (0.75.1):
- FlipperKit/FlipperKitReactPlugin (0.91.1):
- FlipperKit/Core
- FlipperKit/FlipperKitUserDefaultsPlugin (0.75.1):
- FlipperKit/FlipperKitUserDefaultsPlugin (0.91.1):
- FlipperKit/Core
- FlipperKit/SKIOSNetworkPlugin (0.75.1):
- FlipperKit/SKIOSNetworkPlugin (0.91.1):
- FlipperKit/Core
- FlipperKit/FlipperKitNetworkPlugin
- glog (0.3.5)
Expand Down Expand Up @@ -324,25 +338,25 @@ DEPENDENCIES:
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
- Flipper (~> 0.75.1)
- Flipper (= 0.91.1)
- Flipper-DoubleConversion (= 1.1.7)
- Flipper-Folly (~> 2.5.3)
- Flipper-Folly (~> 2.6)
- Flipper-Glog (= 0.3.6)
- Flipper-PeerTalk (~> 0.0.4)
- Flipper-RSocket (~> 1.3)
- FlipperKit (~> 0.75.1)
- FlipperKit/Core (~> 0.75.1)
- FlipperKit/CppBridge (~> 0.75.1)
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1)
- FlipperKit/FBDefines (~> 0.75.1)
- FlipperKit/FKPortForwarding (~> 0.75.1)
- FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1)
- FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1)
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1)
- FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1)
- FlipperKit/FlipperKitReactPlugin (~> 0.75.1)
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1)
- FlipperKit/SKIOSNetworkPlugin (~> 0.75.1)
- Flipper-RSocket (~> 1.4)
- FlipperKit (= 0.91.1)
- FlipperKit/Core (= 0.91.1)
- FlipperKit/CppBridge (= 0.91.1)
- FlipperKit/FBCxxFollyDynamicConvert (= 0.91.1)
- FlipperKit/FBDefines (= 0.91.1)
- FlipperKit/FKPortForwarding (= 0.91.1)
- FlipperKit/FlipperKitHighlightOverlay (= 0.91.1)
- FlipperKit/FlipperKitLayoutPlugin (= 0.91.1)
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.91.1)
- FlipperKit/FlipperKitNetworkPlugin (= 0.91.1)
- FlipperKit/FlipperKitReactPlugin (= 0.91.1)
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.91.1)
- FlipperKit/SKIOSNetworkPlugin (= 0.91.1)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
Expand Down Expand Up @@ -376,7 +390,9 @@ SPEC REPOS:
- boost-for-react-native
- CocoaAsyncSocket
- Flipper
- Flipper-Boost-iOSX
- Flipper-DoubleConversion
- Flipper-Fmt
- Flipper-Folly
- Flipper-Glog
- Flipper-PeerTalk
Expand Down Expand Up @@ -449,14 +465,16 @@ SPEC CHECKSUMS:
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53
FBReactNativeSpec: fddac0b2449b1eb652c14d511ae6a0edab380822
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
FBReactNativeSpec: b61b735aa96cd3bac9694859f14d2c0061bf8ea2
Flipper: 0f8a5accb30d2ec9c3e85e820ce00c3b72a486f3
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
Flipper-Folly: 83af37379faa69497529e414bd43fbfc7cae259a
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
FlipperKit: 4bce4a1dc0b2178ad9cbb2a2c9ca0b5e5c0ecfdc
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
Expand Down Expand Up @@ -486,6 +504,6 @@ SPEC CHECKSUMS:
Yoga: a7de31c64fe738607e7a3803e3f591a4b1df7393
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: dda010b138184a74973eeb039cab0ee65a2a9c46
PODFILE CHECKSUM: 3b914ad842a14256dc9c080ba53250c5f335ed6f

COCOAPODS: 1.10.1
4 changes: 4 additions & 0 deletions ReactNativeOnM1/ios/ReactNativeOnM1-Bridging-Header.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//

15 changes: 13 additions & 2 deletions ReactNativeOnM1/ios/ReactNativeOnM1.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
5D3B835E91FF5E5D74969123 /* libPods-ReactNativeOnM1-ReactNativeOnM1Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 74F8386B9304AA5ACFF17E2D /* libPods-ReactNativeOnM1-ReactNativeOnM1Tests.a */; };
63B390462697C3DE00E9A59A /* ForceBridgingHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63B390452697C3DE00E9A59A /* ForceBridgingHeader.swift */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */

Expand All @@ -38,6 +39,8 @@
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ReactNativeOnM1/main.m; sourceTree = "<group>"; };
182B8745A755B1B35D04F5F2 /* libPods-ReactNativeOnM1.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ReactNativeOnM1.a"; sourceTree = BUILT_PRODUCTS_DIR; };
32DAB5449891778D8C63A94A /* Pods-ReactNativeOnM1.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeOnM1.debug.xcconfig"; path = "Target Support Files/Pods-ReactNativeOnM1/Pods-ReactNativeOnM1.debug.xcconfig"; sourceTree = "<group>"; };
63B390442697C3DE00E9A59A /* ReactNativeOnM1-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ReactNativeOnM1-Bridging-Header.h"; sourceTree = "<group>"; };
63B390452697C3DE00E9A59A /* ForceBridgingHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ForceBridgingHeader.swift; path = ReactNativeOnM1/ForceBridgingHeader.swift; sourceTree = "<group>"; };
74F8386B9304AA5ACFF17E2D /* libPods-ReactNativeOnM1-ReactNativeOnM1Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ReactNativeOnM1-ReactNativeOnM1Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = ReactNativeOnM1/LaunchScreen.storyboard; sourceTree = "<group>"; };
8D0C5660E84F31DDBD1CAEBD /* Pods-ReactNativeOnM1-ReactNativeOnM1Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeOnM1-ReactNativeOnM1Tests.release.xcconfig"; path = "Target Support Files/Pods-ReactNativeOnM1-ReactNativeOnM1Tests/Pods-ReactNativeOnM1-ReactNativeOnM1Tests.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -92,6 +95,8 @@
13B07FB61A68108700A75B9A /* Info.plist */,
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
13B07FB71A68108700A75B9A /* main.m */,
63B390452697C3DE00E9A59A /* ForceBridgingHeader.swift */,
63B390442697C3DE00E9A59A /* ReactNativeOnM1-Bridging-Header.h */,
);
name = ReactNativeOnM1;
sourceTree = "<group>";
Expand All @@ -104,7 +109,6 @@
ECB02D756AE00FF0FAAEF9E2 /* Pods-ReactNativeOnM1-ReactNativeOnM1Tests.debug.xcconfig */,
8D0C5660E84F31DDBD1CAEBD /* Pods-ReactNativeOnM1-ReactNativeOnM1Tests.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
Expand Down Expand Up @@ -208,7 +212,7 @@
TestTargetID = 13B07F861A680F5B00A75B9A;
};
13B07F861A680F5B00A75B9A = {
LastSwiftMigration = 1120;
LastSwiftMigration = 1250;
};
};
};
Expand Down Expand Up @@ -411,6 +415,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
63B390462697C3DE00E9A59A /* ForceBridgingHeader.swift in Sources */,
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
13B07FC11A68108700A75B9A /* main.m in Sources */,
);
Expand All @@ -431,6 +436,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = ECB02D756AE00FF0FAAEF9E2 /* Pods-ReactNativeOnM1-ReactNativeOnM1Tests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand Down Expand Up @@ -458,6 +464,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 8D0C5660E84F31DDBD1CAEBD /* Pods-ReactNativeOnM1-ReactNativeOnM1Tests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
COPY_PHASE_STRIP = NO;
INFOPLIST_FILE = ReactNativeOnM1Tests/Info.plist;
Expand Down Expand Up @@ -486,6 +493,7 @@
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
INFOPLIST_FILE = ReactNativeOnM1/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -498,6 +506,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = ReactNativeOnM1;
SWIFT_OBJC_BRIDGING_HEADER = "ReactNativeOnM1-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -511,6 +520,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
INFOPLIST_FILE = ReactNativeOnM1/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -523,6 +533,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = ReactNativeOnM1;
SWIFT_OBJC_BRIDGING_HEADER = "ReactNativeOnM1-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
};
Expand Down
8 changes: 8 additions & 0 deletions ReactNativeOnM1/ios/ReactNativeOnM1/ForceBridgingHeader.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//
// ForceBridgingHeader.swift
// ReactNativeOnM1
//
// Created by David J Harding on 7/8/21.
//

import Foundation

0 comments on commit 33eb76b

Please sign in to comment.