From 5c59342e6e19989c012877362af529b3d5d0abeb Mon Sep 17 00:00:00 2001 From: Mathew Huusko V Date: Fri, 2 Jun 2017 18:42:17 +0100 Subject: macOS (#38) * Example/Core: create macOS app/tests target * Example/Core: Core_Example/Tests -> Core_Example/Tests_iOS * Example/Core: macOS building/tests passing * Example/Database: separate iOS/macOS targets * BuildFrameworks: macOS * .travis.yml, test.sh: AllUnitTests -> AllUnitTests_iOS * test.sh: add AllUnitTests_macOS * Example/Storage: Example/Tests->_iOS * Example/Storage: macOS * test.sh: try to prevent double error 65 * test.sh: build before test * Example/Auth|Messaging: -> _iOS * Example/Auth: macOS build * Example/Auth: macOS passing * Example/Firebase: pod de/re-integrate; fix static DerivedData references; copy phase for OCMock * Example/Firebase: manually copied OCMock, Products Dir vs. Frameworks * Example/Firebase: copied OCMock, prevent header removal * Example/Storage: integration tests sdk fix * Example/Auth: macOS exclude FIRAuthAppCredentialManager; cleanup * Firebase/Core: remove nullability annotation * Firebase/Core|Database: correct TARGET_X usage for correctness and anticipation of OS_WATCH|TV branches * build.swift: style fix * Firebase/Core: FIRLogger: fix macOS intermittent va_list error --- Example/Podfile | 93 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 78 insertions(+), 15 deletions(-) (limited to 'Example/Podfile') diff --git a/Example/Podfile b/Example/Podfile index 50bc37e..35df51c 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,60 +1,123 @@ use_frameworks! -platform :ios, '8.0' -target 'Core_Example' do +target 'Core_Example_iOS' do + platform :ios, '8.0' + + pod 'FirebaseDev/Core', :path => '../' + + target 'Core_Tests_iOS' do + inherit! :search_paths + pod 'OCMock' + end +end + +target 'Core_Example_macOS' do + platform :osx, '10.10' + pod 'FirebaseDev/Core', :path => '../' - target 'Core_Tests' do + target 'Core_Tests_macOS' do + inherit! :search_paths + pod 'OCMock' + end +end + +target 'Auth_Example_iOS' do + platform :ios, '8.0' + + pod 'FirebaseDev/Auth', :path => '../' + + target 'Auth_Tests_iOS' do inherit! :search_paths pod 'OCMock' end end -target 'Auth_Example' do +target 'Auth_Example_macOS' do + platform :osx, '10.10' + pod 'FirebaseDev/Auth', :path => '../' - target 'Auth_Tests' do + target 'Auth_Tests_macOS' do inherit! :search_paths pod 'OCMock' end end -target 'Database_Example' do +target 'Database_Example_iOS' do + platform :ios, '8.0' + pod 'FirebaseDev/Database', :path => '../' - target 'Database_Tests' do + target 'Database_Tests_iOS' do inherit! :search_paths pod 'OCMock' end - - target 'Database_IntegrationTests' do + + target 'Database_IntegrationTests_iOS' do inherit! :search_paths pod 'OCMock' end end -target 'Messaging_Example' do +target 'Database_Example_macOS' do + platform :osx, '10.10' + + pod 'FirebaseDev/Database', :path => '../' + + target 'Database_Tests_macOS' do + inherit! :search_paths + pod 'OCMock' + end + + target 'Database_IntegrationTests_macOS' do + inherit! :search_paths + pod 'OCMock' + end +end + +target 'Messaging_Example_iOS' do + platform :ios, '8.0' + pod 'FirebaseDev/Messaging', :path => '../' # Lock to the 1.0.9 version of InstanceID since 1.0.10 added a dependency # to FirebaseCore pod 'FirebaseInstanceID', '1.0.9' - target 'Messaging_Tests' do + target 'Messaging_Tests_iOS' do inherit! :search_paths pod 'OCMock' end end -target 'Storage_Example' do +target 'Storage_Example_iOS' do + platform :ios, '8.0' + pod 'FirebaseDev/Storage', :path => '../' - target 'Storage_Tests' do + target 'Storage_Tests_iOS' do inherit! :search_paths pod 'OCMock' end - - target 'Storage_IntegrationTests' do + + target 'Storage_IntegrationTests_iOS' do + inherit! :search_paths + pod 'OCMock' + end +end + +target 'Storage_Example_macOS' do + platform :osx, '10.10' + + pod 'FirebaseDev/Storage', :path => '../' + + target 'Storage_Tests_macOS' do + inherit! :search_paths + pod 'OCMock' + end + + target 'Storage_IntegrationTests_macOS' do inherit! :search_paths pod 'OCMock' end -- cgit v1.2.3