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.

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

[auth-swift] merge master #11907

Merged
merged 123 commits into from
Oct 6, 2023
Merged

[auth-swift] merge master #11907

merged 123 commits into from
Oct 6, 2023

Conversation

paulb777
Copy link
Member

@paulb777 paulb777 commented Oct 6, 2023

After rebasing auth-swift with master to this point, this PR switches to a merge strategy.

Now that the ObjC files are gone, everything needs to be reimplemented anyway and merging is faster. It will also enable past versions to remain functional.

Auth PRs will need to continue to be reimplemented in the auth-swift branch. As of this merge, everything that is in the base + #11532 is reimplemented and the Auth PRs merged here starting with #11554 will still need to be implemented in Swift.

nnsnodnb and others added 30 commits July 12, 2023 10:32
* Require Xcode 14.1

* [Release Tooling] Make 'zip-builder' compatible with Xcode 14

* Cleanup approach and restore disabled code

* Remove unneeded comment and whitespace

* Delete empty symbol link on all platforms

* Fix build issue left over from previous commit

* [skip ci] Remove irrelevant comment

* [skip ci] Remove irrelevant newline

---------

Co-authored-by: Paul Beusterien <[email protected]>
* shared application fix

* lint fix
This was missed in Firebase 10.3.0 because the search for Unreleased was case sensitive.
Added a changelog entry for Firebase Auth 10.13.0.
In Xcode 15 beta 5, TARGET_OS_XR was replaced with TARGET_OS_VISION in ObjC and os(xrOS) was replaced with os(visionOS) in Swift.
#11231 introduces some renamed methods, which broke the Combine build, see this workflow run: firebase/firebase-ios-sdk/actions/runs/5665691823

This PR should fix this.
Reverted reCAPTCHA <-> Auth integration PRs (#11231, #11606, #11609, #11610) due to an issue with the zip build.
* Make tests work against named db

* setup jobs
Increase test timeout to de-flake testes in Google3
@google-cla
Copy link

google-cla bot commented Oct 6, 2023

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@google-oss-bot
Copy link

1 Warning
⚠️ New public headers were added, did you remember to add them to the umbrella header?

Generated by 🚫 Danger

@github-actions
Copy link
Contributor

github-actions bot commented Oct 6, 2023

Apple API Diff Report

Commit: 6e55f7e
Last updated: Fri Oct 6 15:32 PDT 2023
View workflow logs & download artifacts


FirebaseFirestore

Classes

FIRFirestore
[ADDED] persistentCacheIndexManager
Swift:
+  var persistentCacheIndexManager : FIRPersistentCacheIndexManager ? { get }
Objective-C:
+  @property ( nonatomic , readonly , nullable ) FIRPersistentCacheIndexManager * persistentCacheIndexManager ;

FirebaseAppCheck

Classes

FIRAppCheck
[REMOVED] -tokenForcingRefresh:completion:
Swift:
-  func token ( forcingRefresh : Bool ) async throws -> FIRAppCheckToken
Objective-C:
-  - ( void ) tokenForcingRefresh :( BOOL ) forcingRefresh completion :( nonnull void ( ^ )( FIRAppCheckToken * _Nullable , NSError * _Nullable )) handler ;
[REMOVED] -limitedUseTokenWithCompletion:
Swift:
-  func limitedUseToken () async throws -> FIRAppCheckToken
Objective-C:
-  - ( void ) limitedUseTokenWithCompletion : ( nonnull void ( ^ )( FIRAppCheckToken * _Nullable , NSError * _Nullable )) handler ;

@paulb777
Copy link
Member Author

paulb777 commented Oct 6, 2023

Merging here. Auth tests are passing. Other products will update to iOS 13 minimum later to address other failing tests.

@paulb777 paulb777 merged commit 7d82f4e into auth-swift Oct 6, 2023
259 of 282 checks passed
@paulb777 paulb777 deleted the pb-auth-swift-merge-master branch October 6, 2023 23:19
@firebase firebase locked and limited conversation to collaborators Nov 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.