From 3a497fa1a2d7d0fc77650c4963449c03aa6eca5b Mon Sep 17 00:00:00 2001 From: Chris Bianca Date: Fri, 15 Dec 2017 15:14:05 +0000 Subject: [PATCH] [ios] Update podspec location to resolve RN 0.50+ install issues --- RNFirebase.podspec => ios/RNFirebase.podspec | 9 +++--- tests/ios/Podfile | 4 +-- tests/ios/Podfile.lock | 8 +++--- .../project.pbxproj | 28 ------------------- 4 files changed, 10 insertions(+), 39 deletions(-) rename RNFirebase.podspec => ios/RNFirebase.podspec (72%) diff --git a/RNFirebase.podspec b/ios/RNFirebase.podspec similarity index 72% rename from RNFirebase.podspec rename to ios/RNFirebase.podspec index 1582c3f0..dc1e73af 100644 --- a/RNFirebase.podspec +++ b/ios/RNFirebase.podspec @@ -1,5 +1,5 @@ require 'json' -package = JSON.parse(File.read('package.json')) +package = JSON.parse(File.read('../package.json')) Pod::Spec.new do |s| s.name = "RNFirebase" @@ -12,9 +12,8 @@ Pod::Spec.new do |s| s.license = package['license'] s.authors = "Invertase Limited" s.source = { :git => "https://github.com/invertase/react-native-firebase.git", :tag => "v#{s.version}" } - s.social_media_url = 'http://twitter.com/mikediarmid' - s.platform = :ios, "8.0" - s.preserve_paths = 'README.md', 'package.json', '*.js' - s.source_files = 'ios/RNFirebase/**/*.{h,m}' + s.social_media_url = 'http://twitter.com/RNFirebase' + s.platform = :ios, "9.0" + s.source_files = 'RNFirebase/**/*.{h,m}' s.dependency 'React' end diff --git a/tests/ios/Podfile b/tests/ios/Podfile index 980cd7c7..09601bba 100644 --- a/tests/ios/Podfile +++ b/tests/ios/Podfile @@ -3,7 +3,7 @@ install! 'cocoapods', :deterministic_uuids => false # platform :ios, '8.0' target 'ReactNativeFirebaseDemo' do - platform :ios, '8.0' + platform :ios, '9.0' # Uncomment this line if you're using Swift or would like to use dynamic frameworks # use_frameworks! @@ -33,7 +33,7 @@ target 'ReactNativeFirebaseDemo' do pod 'Fabric', '~> 1.7.2' pod 'Crashlytics', '~> 3.9.3' - pod 'RNFirebase', :path => './../../' + pod 'RNFirebase', :path => '../../ios/RNFirebase.podspec' post_install do |installer| installer.pods_project.targets.each do |target| diff --git a/tests/ios/Podfile.lock b/tests/ios/Podfile.lock index f140bddf..55bf24ba 100644 --- a/tests/ios/Podfile.lock +++ b/tests/ios/Podfile.lock @@ -176,14 +176,14 @@ DEPENDENCIES: - React/RCTNetwork (from `../node_modules/react-native`) - React/RCTText (from `../node_modules/react-native`) - React/RCTWebSocket (from `../node_modules/react-native`) - - RNFirebase (from `./../../`) + - RNFirebase (from `../../ios/RNFirebase.podspec`) - yoga (from `../node_modules/react-native/ReactCommon/yoga`) EXTERNAL SOURCES: React: :path: "../node_modules/react-native" RNFirebase: - :path: "./../../" + :path: "../../ios/RNFirebase.podspec" yoga: :path: "../node_modules/react-native/ReactCommon/yoga" @@ -215,9 +215,9 @@ SPEC CHECKSUMS: nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3 Protobuf: 03eef2ee0b674770735cf79d9c4d3659cf6908e8 React: cf892fb84b7d06bf5fea7f328e554c6dcabe85ee - RNFirebase: 30522211772f22affff6f3a61981110852d2668b + RNFirebase: 976f3b35d112017c69da5ada20cf1f15fc2c327e yoga: 3abf02d6d9aeeb139b4c930eb1367feae690a35a -PODFILE CHECKSUM: a5e2256012836120598e7daba7320d085400ecbb +PODFILE CHECKSUM: f17a538903249834df5049668d10174810db4c4c COCOAPODS: 1.2.1 diff --git a/tests/ios/ReactNativeFirebaseDemo.xcodeproj/project.pbxproj b/tests/ios/ReactNativeFirebaseDemo.xcodeproj/project.pbxproj index 0c7128d5..ff7a6e40 100644 --- a/tests/ios/ReactNativeFirebaseDemo.xcodeproj/project.pbxproj +++ b/tests/ios/ReactNativeFirebaseDemo.xcodeproj/project.pbxproj @@ -265,13 +265,6 @@ remoteGlobalIDString = 3D383D621EBD27B9005632C8; remoteInfo = "double-conversion-tvOS"; }; - 997890041E69DE2900F6820C /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C7C48FEEC8E34DE4BB5DE211 /* RNFirebase.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E26E29F41BBE54B800BF9CD9; - remoteInfo = RNFirebase; - }; 997890071E69DE2900F6820C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8BE028F5B04B4DC3BEF0305F /* RNVectorIcons.xcodeproj */; @@ -320,7 +313,6 @@ 8EE7622B1E718A8600B1E0F6 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 93FF19757985B70080544398 /* Pods-ReactNativeFirebaseDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeFirebaseDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-ReactNativeFirebaseDemo/Pods-ReactNativeFirebaseDemo.release.xcconfig"; sourceTree = ""; }; BBEE706291534F5F948A3805 /* libLRDRCTSimpleToast.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libLRDRCTSimpleToast.a; sourceTree = ""; }; - C7C48FEEC8E34DE4BB5DE211 /* RNFirebase.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNFirebase.xcodeproj; path = "../node_modules/react-native-firebase/RNFirebase.xcodeproj"; sourceTree = ""; }; CC24EB30F0484352BD65FFC1 /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; }; DB5BB32AF70B41678974C6B4 /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; }; FD3DFC8253C74B6298AFD3B7 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; }; @@ -521,7 +513,6 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, - C7C48FEEC8E34DE4BB5DE211 /* RNFirebase.xcodeproj */, 8BE028F5B04B4DC3BEF0305F /* RNVectorIcons.xcodeproj */, ); name = Libraries; @@ -570,14 +561,6 @@ name = Products; sourceTree = ""; }; - 99788FE61E69DE2900F6820C /* Products */ = { - isa = PBXGroup; - children = ( - 997890051E69DE2900F6820C /* RNFirebase.framework */, - ); - name = Products; - sourceTree = ""; - }; 99788FE81E69DE2900F6820C /* Products */ = { isa = PBXGroup; children = ( @@ -722,10 +705,6 @@ ProductGroup = 146834001AC3E56700842450 /* Products */; ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, - { - ProductGroup = 99788FE61E69DE2900F6820C /* Products */; - ProjectRef = C7C48FEEC8E34DE4BB5DE211 /* RNFirebase.xcodeproj */; - }, { ProductGroup = 99788FE81E69DE2900F6820C /* Products */; ProjectRef = 8BE028F5B04B4DC3BEF0305F /* RNVectorIcons.xcodeproj */; @@ -957,13 +936,6 @@ remoteRef = 8EC7AC3A1F8397E50041B0FE /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 997890051E69DE2900F6820C /* RNFirebase.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = RNFirebase.framework; - remoteRef = 997890041E69DE2900F6820C /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 997890081E69DE2900F6820C /* libRNVectorIcons.a */ = { isa = PBXReferenceProxy; fileType = archive.ar;