diff options
| author |  Mathew Huusko V <mhuusko5@gmail.com> | 2017-06-02 18:42:17 +0100 |
|---|---|---|
| committer |  Paul Beusterien <paulbeusterien@google.com> | 2017-06-02 10:42:17 -0700 |
| commit | 5c59342e6e19989c012877362af529b3d5d0abeb (patch) | |
| tree | 457f5da7c41ee45b8d3f55f83017fff2ab718781 /Firebase/Storage | |
| parent | 6f700dd6c81711a8605c2587b4f2acfd4e07466b (diff) | |
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
Diffstat (limited to 'Firebase/Storage')
| -rw-r--r-- | Firebase/Storage/FIRStorageUtils.m | 6 | ||||
| -rw-r--r-- | Firebase/Storage/FirebaseStorage.podspec | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Firebase/Storage/FIRStorageUtils.m b/Firebase/Storage/FIRStorageUtils.m index e0abe0a..5c6a1fa 100644 --- a/Firebase/Storage/FIRStorageUtils.m +++ b/Firebase/Storage/FIRStorageUtils.m @@ -12,7 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#if TARGET_OS_IOS #import <MobileCoreServices/MobileCoreServices.h> +#elif TARGET_OS_OSX +#import <CoreServices/CoreServices.h> +#endif #import "FIRStorageUtils.h" @@ -118,4 +122,4 @@ NSString *const kGCSObjectAllowedCharacterSet = return [NSJSONSerialization dataWithJSONObject:dictionary options:0 error:nil]; } -@end
\ No newline at end of file +@end diff --git a/Firebase/Storage/FirebaseStorage.podspec b/Firebase/Storage/FirebaseStorage.podspec index 69c6ddc..24fc2f8 100644 --- a/Firebase/Storage/FirebaseStorage.podspec +++ b/Firebase/Storage/FirebaseStorage.podspec @@ -20,6 +20,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel s.source = { :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => s.version.to_s } s.social_media_url = 'https://twitter.com/Firebase' s.ios.deployment_target = '7.0' + s.osx.deployment_target = '10.10' s.source_files = '**/*.[mh]' s.public_header_files = @@ -35,7 +36,8 @@ Simplify your iOS development, grow your user base, and monetize more effectivel 'FIRStorageTaskSnapshot.h', 'FIRStorageUploadTask.h' - s.framework = 'MobileCoreServices' + s.ios.framework = 'MobileCoreServices' + s.osx.framework = 'CoreServices' # s.dependency 'FirebaseDev/Core' s.dependency 'GTMSessionFetcher/Core', '~> 1.1' s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => |