diff --git a/RNTester/Podfile b/RNTester/Podfile index 40f86d9979d66a..deb6b77c5b61f2 100644 --- a/RNTester/Podfile +++ b/RNTester/Podfile @@ -1,6 +1,7 @@ -platform :ios, '10.0' +require_relative '../scripts/react_native_pods' -require_relative '../scripts/autolink-ios' +source 'https://cdn.cocoapods.org/' +platform :ios, '10.0' if ENV['USE_FRAMEWORKS'] == '1' puts "Installing pods with use_frameworks!" @@ -24,55 +25,9 @@ def pods() # use_react_native!(path: "..", fabric_enabled: true) end - -def flipper_pods() - flipperkit_version = '0.30.1' - pod 'FlipperKit', '~>' + flipperkit_version, :configuration => 'Debug' - pod 'FlipperKit/FlipperKitLayoutPlugin', '~>' + flipperkit_version, :configuration => 'Debug' - pod 'FlipperKit/SKIOSNetworkPlugin', '~>' + flipperkit_version, :configuration => 'Debug' - pod 'FlipperKit/FlipperKitUserDefaultsPlugin', '~>' + flipperkit_version, :configuration => 'Debug' - pod 'FlipperKit/FlipperKitReactPlugin', '~>' + flipperkit_version, :configuration => 'Debug' - - if ENV['USE_FRAMEWORKS'] == '1' - $static_framework = ['FlipperKit', 'Flipper', 'Flipper-Folly', - 'CocoaAsyncSocket', 'ComponentKit', 'Flipper-DoubleConversion', - 'Flipper-Glog', 'Flipper-PeerTalk', 'Flipper-RSocket', - 'CocoaLibEvent', 'OpenSSL-Universal', 'boost-for-react-native'] - - pre_install do |installer| - Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {} - installer.pod_targets.each do |pod| - if $static_framework.include?(pod.name) - def pod.build_type; - Pod::Target::BuildType.static_library - end - end - end - end - end -end - -# Post Install processing for Flipper -def flipper_post_install(installer) - file_name = Dir.glob("*.xcodeproj")[0] - app_project = Xcodeproj::Project.open(file_name) - app_project.native_targets.each do |target| - target.build_configurations.each do |config| - cflags = config.build_settings['OTHER_CFLAGS'] || '$(inherited) ' - unless cflags.include? '-DFB_SONARKIT_ENABLED=1' - puts 'Adding -DFB_SONARKIT_ENABLED=1 in OTHER_CFLAGS...' - cflags << ' -DFB_SONARKIT_ENABLED=1 ' - end - config.build_settings['OTHER_CFLAGS'] = cflags - end - app_project.save - end - installer.pods_project.save -end - target 'RNTester' do pods() - flipper_pods() + use_flipper! end target 'RNTesterUnitTests' do @@ -85,9 +40,24 @@ target 'RNTesterIntegrationTests' do pod 'React-RCTTest', :path => "./RCTTest" end +if ENV['USE_FRAMEWORKS'] == '1' + static_frameworks = ['FlipperKit', 'Flipper', 'Flipper-Folly', + 'CocoaAsyncSocket', 'ComponentKit', 'Flipper-DoubleConversion', + 'Flipper-Glog', 'Flipper-PeerTalk', 'Flipper-RSocket', + 'CocoaLibEvent', 'OpenSSL-Universal', 'boost-for-react-native'] + + pre_install do |installer| + Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {} + installer.pod_targets.each do |pod| + if static_frameworks.include?(pod.name) + def pod.build_type + Pod::Target::BuildType.static_library + end + end + end + end +end + post_install do |installer| flipper_post_install(installer) - installer.pods_project.targets.each do |target| - puts target.name - end end diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 7bf154465eb368..c974088453a4d7 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -338,11 +338,11 @@ DEPENDENCIES: - DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../Libraries/FBLazyVector`) - FBReactNativeSpec (from `../Libraries/FBReactNativeSpec`) - - FlipperKit (~> 0.30.1) - - FlipperKit/FlipperKitLayoutPlugin (~> 0.30.1) - - FlipperKit/FlipperKitReactPlugin (~> 0.30.1) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.30.1) - - FlipperKit/SKIOSNetworkPlugin (~> 0.30.1) + - FlipperKit (~> 0.30.2) + - FlipperKit/FlipperKitLayoutPlugin (~> 0.30.2) + - FlipperKit/FlipperKitReactPlugin (~> 0.30.2) + - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.30.2) + - FlipperKit/SKIOSNetworkPlugin (~> 0.30.2) - Folly (from `../third-party-podspecs/Folly.podspec`) - glog (from `../third-party-podspecs/glog.podspec`) - RCTRequired (from `../Libraries/RCTRequired`) @@ -374,7 +374,7 @@ DEPENDENCIES: - Yoga (from `../ReactCommon/yoga`) SPEC REPOS: - trunk: + https://cdn.cocoapods.org/: - boost-for-react-native - CocoaAsyncSocket - CocoaLibEvent @@ -451,8 +451,8 @@ SPEC CHECKSUMS: CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f DoubleConversion: cde416483dac037923206447da6e1454df403714 - FBLazyVector: 9806caa151956ce2238f70bde6649a6e3468d2c2 - FBReactNativeSpec: 36a4e4488cc758ffceea8e1b3b5c6dab3ed99fa2 + FBLazyVector: 1a80668583eea1846d68bb05300a6800ac10f364 + FBReactNativeSpec: 21c8424b3e50dc6d06a95837edcf9b8c3ccbd738 Flipper: 10b225e352595f521be0e5badddd90e241336e89 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Folly: 2de3d03e0acc7064d5e4ed9f730e2f217486f162 @@ -463,31 +463,31 @@ SPEC CHECKSUMS: Folly: b73c3869541e86821df3c387eb0af5f65addfab4 glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 - RCTRequired: f04f9813bccb37099f642722b46e879fc47c7e78 - RCTTypeSafety: 26a1a3b30655098b72d3954e3e7d0f9a7a059e95 - React: 7b262249ab4afa1d300c9e90f50edcc2a5f72bcd - React-ART: 25a40dbfb785ceec6ca41d5bd1ec997ca8c01f17 - React-Core: 86046aecc5d3297cd37391ad7577e33784bcff74 - React-CoreModules: b6dd63292ef064320a8c1b2e40291b95690e0e5f - React-cxxreact: 9a0a25be41fd93b42d3cbef6311b309a1da53191 - React-jsi: 1143a100f9e746b6acb9c8ebff6c3fe66669e404 - React-jsiexecutor: 56259faac069d4e475001c1ddb042ef622318f10 - React-jsinspector: 5a11c19a7a267ea4a54f7082ca7834470f5c3fec - React-RCTActionSheet: 83587cdb4e14b9d986058a3acec8fc1cd9815b59 - React-RCTAnimation: e328fb809d590c09d88aa4d42f3963de522fef90 - React-RCTBlob: de3bd0bdbc42ec4e64183aefec9d582a7463cf00 - React-RCTImage: 046397bd2ba8506628b720ba3baf2ba7e331b1bf - React-RCTLinking: 7b77eca020eaf222d19151f0f52cd6065cbc90ec - React-RCTNetwork: d16dd52792dc3d66c3e23b464afe0f759d3a5670 - React-RCTPushNotification: 9290035bbd9ecef15f03d760cc422a219b55be07 - React-RCTSettings: f7daf792f772c8582b31c7aeeb1f146df61a52a7 - React-RCTTest: e10acfa457347879d3723bc85f1d2754414b9d2c - React-RCTText: b3eb3514addd9b105c0edb05ed32333428ba2a52 - React-RCTVibration: e2856bb9408f7e8eccfe870e123e5644ab744219 - ReactCommon: c3834cbee58b60f71c8155c04a3f44e60ec017fb - Yoga: f7fa200d8c49f97b54c9421079e781fb900b5cae + RCTRequired: c6fc600e38b30fdc4ca81632b5debc5de5f10bcd + RCTTypeSafety: ab7ddb9386855a13d21af7dd6ce857a8e1c16496 + React: f454bdb280bcea4752223ed6126bd45bd13ff117 + React-ART: 6ed675db9950964eb1710e76bedf7449d7655771 + React-Core: 8f518713ea5b2a85be06637664bbc1e0e3266981 + React-CoreModules: 4c852bebf9f470a202f331834b4b5f98c960e8e2 + React-cxxreact: 7aa9bb80f9177dbee7d66af187933ecd41691466 + React-jsi: 59ae8f98ce1b5323783327582bcd5bff45c537d7 + React-jsiexecutor: eb610d0fefd4679a7354c3d9d6c987a7a65e5a82 + React-jsinspector: 269c08f6f120df85fea16374eadbc40802019e56 + React-RCTActionSheet: 3817ff1e965ad95259c8ec592208cc0d4ffd9db9 + React-RCTAnimation: f93b5b5e454cb50fcb60a89ab295a5f037d89d2d + React-RCTBlob: faa4cbf162739bcfcddeb0ba38c523575b74d5f9 + React-RCTImage: d87fdaf9083a4cad106039a18d06659d6c945b30 + React-RCTLinking: 59b7133341f10605d5b0b79224d42a042c9b2967 + React-RCTNetwork: 1ac64c6f9eb4e5e8e5d6a9e70643eaa1f5eaa02d + React-RCTPushNotification: 61ba7da560a4e822be36da47b7260587c3afaaa5 + React-RCTSettings: add8aeed448146f006e6d58e510986cdffacbe55 + React-RCTTest: 74b3d8026c40ab1e84644f63ebc13ce072362288 + React-RCTText: 68b14afeb4be8f0e45d1d28950b7ddcb4123531a + React-RCTVibration: df38dbeda3f6dfea60e86ee05f0f118dc9d47c25 + ReactCommon: a2f02820c3004588a13e45c45b48bc6208b287fe + Yoga: 41c7bf919718ec637e4d3ae3956849fd29eef9de YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 317625c4a1217b69f61b4979b58e9ef2f376f583 +PODFILE CHECKSUM: 4a9f123d5b72f031185f4a5a636bb59105baf3c4 COCOAPODS: 1.8.4 diff --git a/RNTester/RNTesterPods.xcodeproj/project.pbxproj b/RNTester/RNTesterPods.xcodeproj/project.pbxproj index 6e60b38a66439b..5dde964f3e58a9 100644 --- a/RNTester/RNTesterPods.xcodeproj/project.pbxproj +++ b/RNTester/RNTesterPods.xcodeproj/project.pbxproj @@ -13,11 +13,11 @@ 27F441EC1BEBE5030039B79C /* FlexibleSizeExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */; }; 2DDEF0101F84BF7B00DBDF73 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */; }; 3D2AFAF51D646CF80089D1A3 /* legacy_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */; }; - 442B673CCEF28320AE16877B /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3C8BDC1E54DFC8EB0F67828 /* libPods-RNTester.a */; }; 5C60EB1C226440DB0018C04F /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C60EB1B226440DB0018C04F /* AppDelegate.mm */; }; 5CB07C9B226467E60039471C /* RNTesterTurboModuleProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CB07C99226467E60039471C /* RNTesterTurboModuleProvider.mm */; }; - AB71F075B51B1FA0C65DCF39 /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2723489EF058D50FF7217FD9 /* libPods-RNTesterUnitTests.a */; }; - CBC719CA19D2FD9247BD28F1 /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67373A0E14C242E758EE729F /* libPods-RNTesterIntegrationTests.a */; }; + 6766440649168A1FAD1DB4A4 /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F836A7C97EC1BA121BA5A2A /* libPods-RNTesterIntegrationTests.a */; }; + 6ABAB5205C9B8E0726E12033 /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B5C8E567A4E6281113811CB1 /* libPods-RNTester.a */; }; + 85C7978AB28C149170A56955 /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 11941849F77C552FDC3EED77 /* libPods-RNTesterUnitTests.a */; }; E7C1241A22BEC44B00DA25C0 /* RNTesterIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7C1241922BEC44B00DA25C0 /* RNTesterIntegrationTests.m */; }; E7DB20D122B2BAA6005AC45F /* RCTBundleURLProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20A922B2BAA3005AC45F /* RCTBundleURLProviderTests.m */; }; E7DB20D222B2BAA6005AC45F /* RCTModuleInitNotificationRaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20AA22B2BAA3005AC45F /* RCTModuleInitNotificationRaceTests.m */; }; @@ -69,12 +69,12 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 11941849F77C552FDC3EED77 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07F961A680F5B00A75B9A /* RNTester.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RNTester.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = RNTester/AppDelegate.h; sourceTree = ""; }; 13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNTester/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = RNTester/main.m; sourceTree = ""; }; - 2723489EF058D50FF7217FD9 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 272E6B3B1BEA849E001FCF37 /* UpdatePropertiesExampleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePropertiesExampleView.h; path = RNTester/NativeExampleViews/UpdatePropertiesExampleView.h; sourceTree = ""; }; 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePropertiesExampleView.m; path = RNTester/NativeExampleViews/UpdatePropertiesExampleView.m; sourceTree = ""; }; 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FlexibleSizeExampleView.m; path = RNTester/NativeExampleViews/FlexibleSizeExampleView.m; sourceTree = ""; }; @@ -86,11 +86,11 @@ 5C60EB1B226440DB0018C04F /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = RNTester/AppDelegate.mm; sourceTree = ""; }; 5CB07C99226467E60039471C /* RNTesterTurboModuleProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RNTesterTurboModuleProvider.mm; path = RNTester/RNTesterTurboModuleProvider.mm; sourceTree = ""; }; 5CB07C9A226467E60039471C /* RNTesterTurboModuleProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNTesterTurboModuleProvider.h; path = RNTester/RNTesterTurboModuleProvider.h; sourceTree = ""; }; - 67373A0E14C242E758EE729F /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5F836A7C97EC1BA121BA5A2A /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 7D51F73F0DA20287418D98BD /* Pods-RNTesterIntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.release.xcconfig"; sourceTree = ""; }; 972A459EE6CF8CC63531A088 /* Pods-RNTesterIntegrationTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.debug.xcconfig"; sourceTree = ""; }; 98233960D1D6A1977D1C7EAF /* Pods-RNTester.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester/Pods-RNTester.debug.xcconfig"; sourceTree = ""; }; - D3C8BDC1E54DFC8EB0F67828 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B5C8E567A4E6281113811CB1 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E771AEEA22B44E3100EA1189 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNTester/Info.plist; sourceTree = ""; }; E7C1241922BEC44B00DA25C0 /* RNTesterIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNTesterIntegrationTests.m; sourceTree = ""; }; E7DB209F22B2BA84005AC45F /* RNTesterUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RNTesterUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -171,7 +171,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 442B673CCEF28320AE16877B /* libPods-RNTester.a in Frameworks */, + 6ABAB5205C9B8E0726E12033 /* libPods-RNTester.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -181,7 +181,7 @@ files = ( E7DB213122B2C649005AC45F /* JavaScriptCore.framework in Frameworks */, E7DB213222B2C67D005AC45F /* libOCMock.a in Frameworks */, - AB71F075B51B1FA0C65DCF39 /* libPods-RNTesterUnitTests.a in Frameworks */, + 85C7978AB28C149170A56955 /* libPods-RNTesterUnitTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -191,7 +191,7 @@ files = ( E7DB218C22B41FCD005AC45F /* XCTest.framework in Frameworks */, E7DB216722B2F69F005AC45F /* JavaScriptCore.framework in Frameworks */, - CBC719CA19D2FD9247BD28F1 /* libPods-RNTesterIntegrationTests.a in Frameworks */, + 6766440649168A1FAD1DB4A4 /* libPods-RNTesterIntegrationTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -261,9 +261,9 @@ E7DB211822B2BD53005AC45F /* libReact-RCTText.a */, E7DB211A22B2BD53005AC45F /* libReact-RCTVibration.a */, E7DB212222B2BD53005AC45F /* libyoga.a */, - D3C8BDC1E54DFC8EB0F67828 /* libPods-RNTester.a */, - 67373A0E14C242E758EE729F /* libPods-RNTesterIntegrationTests.a */, - 2723489EF058D50FF7217FD9 /* libPods-RNTesterUnitTests.a */, + B5C8E567A4E6281113811CB1 /* libPods-RNTester.a */, + 5F836A7C97EC1BA121BA5A2A /* libPods-RNTesterIntegrationTests.a */, + 11941849F77C552FDC3EED77 /* libPods-RNTesterUnitTests.a */, ); name = Frameworks; sourceTree = ""; @@ -692,6 +692,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; DEVELOPMENT_TEAM = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "FB_SONARKIT_ENABLED=1", + ); HEADER_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_ROOT}/Headers/Public\"", @@ -734,10 +738,6 @@ "$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)", ); "LIBRARY_SEARCH_PATHS[arch=*]" = "$(inherited)"; - OTHER_CFLAGS = ( - "$(inherited)", - "-DFB_SONARKIT_ENABLED=1", - ); OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -799,10 +799,6 @@ "$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)", "$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)", ); - OTHER_CFLAGS = ( - "$(inherited)", - "-DFB_SONARKIT_ENABLED=1", - ); OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/package.json b/package.json index e2af4846c1e98d..67af8836c6b596 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "ReactCommon", "README.md", "rn-get-polyfills.js", - "scripts/autolink-ios.rb", + "scripts/react_native_pods.rb", "scripts/compose-source-maps.js", "scripts/ios-configure-glog.sh", "scripts/launchPackager.bat", diff --git a/scripts/autolink-ios.rb b/scripts/react_native_pods.rb similarity index 98% rename from scripts/autolink-ios.rb rename to scripts/react_native_pods.rb index 6e6bf35c6ceb9f..dade16986260af 100644 --- a/scripts/autolink-ios.rb +++ b/scripts/react_native_pods.rb @@ -57,8 +57,7 @@ def use_react_native! (options={}) end end -def add_flipper_pods! - version = '~> 0.30.0' +def use_flipper!(version = '~> 0.30.2') pod 'FlipperKit', version, :configuration => 'Debug' pod 'FlipperKit/FlipperKitLayoutPlugin', version, :configuration => 'Debug' pod 'FlipperKit/SKIOSNetworkPlugin', version, :configuration => 'Debug' diff --git a/template/ios/Podfile b/template/ios/Podfile index 3dd09a76286a7e..d6f78d75e05171 100644 --- a/template/ios/Podfile +++ b/template/ios/Podfile @@ -1,7 +1,8 @@ -platform :ios, '10.0' -require_relative '../node_modules/react-native/scripts/autolink-ios' +require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' +platform :ios, '10.0' + target 'HelloWorld' do # Pods for HelloWorld use_react_native! @@ -17,7 +18,7 @@ target 'HelloWorld' do # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable these next few lines. - add_flipper_pods! + use_flipper! post_install do |installer| flipper_post_install(installer) end