Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for 6.31.1 #6368

Merged
merged 2 commits into from
Aug 31, 2020
Merged

Prepare for 6.31.1 #6368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e1cf54
Restore Firebase.h to pre-6.28.0 style (#6367)
paulb777 Aug 28, 2020
f4f875a
Version 6.31.1
paulb777 Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 5 additions & 34 deletions CoreOnly/Sources/Firebase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,30 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// The module qualified imports are for CocoaPods and the simple file names
// for Swift Package Manager.
#import <FirebaseCore/FirebaseCore.h>

#if !defined(__has_include)
#error "Firebase.h won't import anything if your compiler doesn't support __has_include. Please \
import the headers individually."
#else
#if __has_include(<FirebaseCore/FirebaseCore.h>)
#import <FirebaseCore/FirebaseCore.h>
#elif __has_include("FirebaseCore.h")
#import "FirebaseCore.h"
#endif

#if __has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
#import <FirebaseAnalytics/FirebaseAnalytics.h>
#endif

#if __has_include(<FirebaseAuth/FirebaseAuth.h>)
#import <FirebaseAuth/FirebaseAuth.h>
#elif __has_include("FirebaseAuth.h")
#import "FirebaseAuth.h"
#endif

#if __has_include(<FirebaseAppDistribution/FirebaseAppDistribution.h>)
#import <FirebaseAppDistribution/FirebaseAppDistribution.h>
#elif __has_include("FirebaseAppDistribution.h")
#import "FirebaseAppDistribution.h"
#endif

#if __has_include(<FirebaseAuth/FirebaseAuth.h>)
#import <FirebaseAuth/FirebaseAuth.h>
#endif

#if __has_include(<FirebaseCrashlytics/FirebaseCrashlytics.h>)
#import <FirebaseCrashlytics/FirebaseCrashlytics.h>
#elif __has_include("FirebaseCrashlytics.h")
#import "FirebaseCrashlytics.h"
#endif

#if __has_include(<FirebaseDatabase/FirebaseDatabase.h>)
#import <FirebaseDatabase/FirebaseDatabase.h>
#elif __has_include("FirebaseDatabase.h")
#import "FirebaseDatabase.h"
#endif

#if __has_include(<FirebaseDynamicLinks/FirebaseDynamicLinks.h>)
Expand All @@ -62,20 +47,14 @@
Firebase Dynamic Links works as intended."
#endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
#endif
#elif __has_include("FirebaseDynamicLinks.h")
#import "FirebaseDynamicLinks.h"
#endif

#if __has_include(<FirebaseFirestore/FirebaseFirestore.h>)
#import <FirebaseFirestore/FirebaseFirestore.h>
#elif __has_include("FirebaseFirestore.h")
#import "FirebaseFirestore.h"
#endif

#if __has_include(<FirebaseFunctions/FirebaseFunctions.h>)
#import <FirebaseFunctions/FirebaseFunctions.h>
#elif __has_include("FirebaseFunctions.h")
#import "FirebaseFunctions.h"
#endif

#if __has_include(<FirebaseInAppMessaging/FirebaseInAppMessaging.h>)
Expand All @@ -87,8 +66,6 @@ Firebase Dynamic Links works as intended."
Firebase In App Messaging works as intended."
#endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
#endif
#elif __has_include("FirebaseInAppMessaging.h")
#import "FirebaseInAppMessaging.h"
#endif

#if __has_include(<FirebaseInstanceID/FirebaseInstanceID.h>)
Expand All @@ -104,8 +81,6 @@ Firebase In App Messaging works as intended."
Firebase Messaging works as intended."
#endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
#endif
#elif __has_include("FirebaseMessaging.h")
#import "FirebaseMessaging.h"
#endif

#if __has_include(<FirebaseMLCommon/FirebaseMLCommon.h>)
Expand Down Expand Up @@ -180,14 +155,10 @@ Firebase Performance works as intended."
Firebase Remote Config works as intended."
#endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
#endif
#elif __has_include("FirebaseRemoteConfig.h")
#import "FirebaseRemoteConfig.h"
#endif

#if __has_include(<FirebaseStorage/FirebaseStorage.h>)
#import <FirebaseStorage/FirebaseStorage.h>
#elif __has_include("FirebaseStorage.h")
#import "FirebaseStorage.h"
#endif

#if __has_include(<GoogleMobileAds/GoogleMobileAds.h>)
Expand Down
4 changes: 2 additions & 2 deletions Firebase.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Firebase'
s.version = '6.31.0'
s.version = '6.31.1'
s.summary = 'Firebase'

s.description = <<-DESC
Expand Down Expand Up @@ -71,7 +71,7 @@ Simplify your app development, grow your user base, and monetize more effectivel

s.subspec 'AppDistribution' do |ss|
ss.dependency 'Firebase/CoreOnly'
ss.ios.dependency 'FirebaseAppDistribution', '~> 0.9.0'
ss.ios.dependency 'FirebaseAppDistribution', '~> 0.9.1'
ss.ios.deployment_target = '9.0'
end

Expand Down
5 changes: 4 additions & 1 deletion FirebaseCore/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# v6.10.1 -- M78
# Firebase 6.31.1
- [fixed] Sporadic missing FirebaseApp symbol build issue introduced in Firebase 6.28.0. (#6341)

# Firebase 6.31.0 FirebaseCore 6.10.1 -- M78
- [added] Beta release of Swift Package Manager. Details
[here](https://github.com/firebase/firebase-ios-sdk/blob/master/SwiftPackageManager.md). (#3136)
- [changed] Firebase's dependencies on nanopb are updated from version 0.3.9.5 to
Expand Down