Skip to content

Restore SafariServices framework #2002

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

Merged
merged 2 commits into from
Oct 25, 2018
Merged

Restore SafariServices framework #2002

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
3339e4f
Restore SafariServices framework
paulb777 Oct 24, 2018
c37d892
SafariServices not available on tvOS and not used on osx
paulb777 Oct 24, 2018
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
11 changes: 9 additions & 2 deletions Firebase/Auth/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# v5.1.0
- Adds `FIRAuthErrorCodeMalformedJWT`, which is raised on JWT token parsing
# v5.0.5
- Restore SafariServices framework dependency (#2002).

# v5.0.4
- Fix analyzer issues (#1740).

# v5.0.3
- Adds `FIRAuthErrorCodeMalformedJWT`, which is raised on JWT token parsing.
failures during auth operations (#1436).
- Migrate to use FirebaseAuthInterop interfaces to access FirebaseAuth (#1501).

# v5.0.2
- Fix an issue where JWT date timestamps weren't parsed correctly. (#1319)
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ supports email and password accounts, as well as several 3rd party authenticatio
'FIRAuth_VERSION=' + s.version.to_s +
' FIRAuth_MINOR_VERSION=' + s.version.to_s.split(".")[0] + "." + s.version.to_s.split(".")[1]
}
s.framework = 'SafariServices'
s.framework = 'Security'
s.ios.framework = 'SafariServices'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I don't understand why this restores SafariServices.
Will it affect other platforms?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the previous version with :

  s.framework = 'SafariServices'
  s.framework = 'Security'

The value of s.framework was set to SafariServices and then overwritten with Security before it was processed.

If you look at the build FirebaseAuth-iOS Build target in a previous build of Firebase.xcworkspace, you'll see that SafariServices was missing:

screen shot 2018-10-24 at 4 32 51 pm

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can it be s.frameworks = 'SafariServices', 'Security'? I'm concerned it may cause problem on other platforms

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I discovered in travis testing, SafariServices doesn't exist on tvOS and we don't use it on either tvOS or osx.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for clarifying!

s.dependency 'FirebaseAuthInterop', '~> 1.0'
s.dependency 'FirebaseCore', '~> 5.1'
s.dependency 'GoogleUtilities/Environment', '~> 5.2'
Expand Down
4 changes: 1 addition & 3 deletions FirebaseCore.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
s.source_files = 'Firebase/Core/**/*.[mh]'
s.public_header_files = 'Firebase/Core/Public/*.h', 'Firebase/Core/Private/*.h'
s.private_header_files = 'Firebase/Core/Private/*.h'
s.frameworks = [
'Foundation'
]
s.framework = 'Foundation'
s.dependency 'GoogleUtilities/Logger', '~> 5.2'
s.pod_target_xcconfig = {
'GCC_C_LANGUAGE_STANDARD' => 'c99',
Expand Down
2 changes: 1 addition & 1 deletion FirebaseDatabase.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
base_dir + 'third_party/SocketRocket/fbase64.c'
s.public_header_files = base_dir + 'Public/*.h'
s.libraries = ['c++', 'icucore']
s.frameworks = ['CFNetwork', 'Security', 'SystemConfiguration']
s.frameworks = 'CFNetwork', 'Security', 'SystemConfiguration'
s.dependency 'leveldb-library', '~> 1.18'
s.dependency 'FirebaseCore', '~> 5.0'
s.pod_target_xcconfig = {
Expand Down
6 changes: 1 addition & 5 deletions FirebaseDynamicLinks.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ Firebase Dynamic Links are deep links that enhance user experience and increase

s.source_files = 'Firebase/DynamicLinks/**/*.[mh]'
s.public_header_files = 'Firebase/DynamicLinks/Public/*.h'
s.frameworks = [
'AssetsLibrary',
'MessageUI',
'QuartzCore',
]
s.frameworks = 'AssetsLibrary', 'MessageUI', 'QuartzCore'
s.weak_framework = 'WebKit'
s.dependency 'FirebaseCore', '~> 5.1'
s.ios.dependency 'FirebaseAnalytics', '~> 5.1'
Expand Down