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/Core/Private | |
| 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/Core/Private')
| -rw-r--r-- | Firebase/Core/Private/FIRAppEnvironmentUtil.h | 9 | ||||
| -rw-r--r-- | Firebase/Core/Private/FIRLogger.h | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Firebase/Core/Private/FIRAppEnvironmentUtil.h b/Firebase/Core/Private/FIRAppEnvironmentUtil.h index ba4696c..7ae9827 100644 --- a/Firebase/Core/Private/FIRAppEnvironmentUtil.h +++ b/Firebase/Core/Private/FIRAppEnvironmentUtil.h @@ -16,7 +16,11 @@ #import <Foundation/Foundation.h> +#if TARGET_OS_IOS #import <UIKit/UIKit.h> +#elif TARGET_OS_OSX +#import <AppKit/AppKit.h> +#endif @interface FIRAppEnvironmentUtil : NSObject @@ -42,7 +46,12 @@ /// Indicates whether it is running inside an extension or an app. + (BOOL)isAppExtension; +#if TARGET_OS_IOS /// Returns the [UIApplication sharedApplication] if it is running on an app, not an extension. + (UIApplication *)sharedApplication; +#elif TARGET_OS_OSX +/// Returns the [NSApplication sharedApplication]. ++ (NSApplication *)sharedApplication; +#endif @end diff --git a/Firebase/Core/Private/FIRLogger.h b/Firebase/Core/Private/FIRLogger.h index 2206c0a..7680e04 100644 --- a/Firebase/Core/Private/FIRLogger.h +++ b/Firebase/Core/Private/FIRLogger.h @@ -81,7 +81,7 @@ extern void FIRLogBasic(FIRLoggerLevel level, NSString *message, // On 64-bit simulators, va_list is not a pointer, so cannot be marked nullable // See: http://stackoverflow.com/q/29095469 -#if __LP64__ && TARGET_IPHONE_SIMULATOR +#if __LP64__ && TARGET_OS_SIMULATOR || TARGET_OS_OSX va_list args_ptr #else va_list _Nullable args_ptr |