From 2e1cf54d60c028af45c71bdf303a7e99ee034ca8 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 28 Aug 2020 14:25:01 -0700 Subject: [PATCH 1/2] Restore Firebase.h to pre-6.28.0 style (#6367) * Restore Firebase.h now that SPM supports same public header path as CocoaPods --- CoreOnly/Sources/Firebase.h | 39 +++++-------------------------------- FirebaseCore/CHANGELOG.md | 4 ++++ 2 files changed, 9 insertions(+), 34 deletions(-) diff --git a/CoreOnly/Sources/Firebase.h b/CoreOnly/Sources/Firebase.h index 767c0d6296e..b5c716d7ac4 100755 --- a/CoreOnly/Sources/Firebase.h +++ b/CoreOnly/Sources/Firebase.h @@ -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 #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() - #import - #elif __has_include("FirebaseCore.h") - #import "FirebaseCore.h" - #endif - #if __has_include() #import #endif - #if __has_include() - #import - #elif __has_include("FirebaseAuth.h") - #import "FirebaseAuth.h" - #endif - #if __has_include() #import - #elif __has_include("FirebaseAppDistribution.h") - #import "FirebaseAppDistribution.h" + #endif + + #if __has_include() + #import #endif #if __has_include() #import - #elif __has_include("FirebaseCrashlytics.h") - #import "FirebaseCrashlytics.h" #endif #if __has_include() #import - #elif __has_include("FirebaseDatabase.h") - #import "FirebaseDatabase.h" #endif #if __has_include() @@ -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() #import - #elif __has_include("FirebaseFirestore.h") - #import "FirebaseFirestore.h" #endif #if __has_include() #import - #elif __has_include("FirebaseFunctions.h") - #import "FirebaseFunctions.h" #endif #if __has_include() @@ -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() @@ -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() @@ -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() #import - #elif __has_include("FirebaseStorage.h") - #import "FirebaseStorage.h" #endif #if __has_include() diff --git a/FirebaseCore/CHANGELOG.md b/FirebaseCore/CHANGELOG.md index 1dbe4356454..216371ad005 100644 --- a/FirebaseCore/CHANGELOG.md +++ b/FirebaseCore/CHANGELOG.md @@ -1,3 +1,7 @@ +# Unreleased +- [fixed] Sporadic missing FirebaseApp symbol build issue introduced in Firebase 6.28.0. (#6341) + + # v6.10.1 -- M78 - [added] Beta release of Swift Package Manager. Details [here](https://github.com/firebase/firebase-ios-sdk/blob/master/SwiftPackageManager.md). (#3136) From f4f875af0b2de6079ddfd0072f02f686df854694 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 28 Aug 2020 14:28:50 -0700 Subject: [PATCH 2/2] Version 6.31.1 --- Firebase.podspec | 4 ++-- FirebaseCore/CHANGELOG.md | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Firebase.podspec b/Firebase.podspec index e75cb146c7e..95026050e3f 100644 --- a/Firebase.podspec +++ b/Firebase.podspec @@ -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 @@ -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 diff --git a/FirebaseCore/CHANGELOG.md b/FirebaseCore/CHANGELOG.md index 216371ad005..8317eecab28 100644 --- a/FirebaseCore/CHANGELOG.md +++ b/FirebaseCore/CHANGELOG.md @@ -1,8 +1,7 @@ -# Unreleased +# Firebase 6.31.1 - [fixed] Sporadic missing FirebaseApp symbol build issue introduced in Firebase 6.28.0. (#6341) - -# v6.10.1 -- M78 +# 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