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

Jump to bottom

Fix import regression when mixing 6.7.0 with earlier Firebase versions #6050

Merged
merged 1 commit into from
Jul 15, 2020
Merged

Fix import regression when mixing 6.7.0 with earlier Firebase versions #6050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,3 +293,4 @@ jobs:
branches:
only:
- master
- pb-fix6047
2 changes: 1 addition & 1 deletion GoogleUtilities.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 = 'GoogleUtilities'
s.version = '6.7.0'
s.version = '6.7.1'
s.summary = 'Google Utilities for iOS (plus community support for macOS and tvOS)'

s.description = <<-DESC
Expand Down
4 changes: 4 additions & 0 deletions GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@

#import <Foundation/Foundation.h>

#if SWIFT_PACKAGE
#import "GoogleUtilities/AppDelegateSwizzler/Private/GULApplication.h"
#else
#import <GoogleUtilities/GULApplication.h>
#endif

NS_ASSUME_NONNULL_BEGIN

Expand Down
3 changes: 3 additions & 0 deletions GoogleUtilities/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 6.7.1
- Fix import regression when mixing 6.7.0 with earlier Firebase versions. (#6047)

# 6.7.0 -- M75
- Lazily access filesystem outside of `GULHeartbeatDateStorage` initializer. (#5969)
- Update source imports to use repo-relative headers. (#5824)
Expand Down