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

[auth-swift] Merge main #13034

Merged
merged 108 commits into from
May 29, 2024
Merged

[auth-swift] Merge main #13034

merged 108 commits into from
May 29, 2024

Conversation

paulb777
Copy link
Member

#no-changelog

andrewheard and others added 30 commits April 30, 2024 17:37
@andrewheard
[Release] Update Package.swift for 10.26.0 (#12873)
f7d0ac6
@andrewheard
Add prototype for Firebase Vertex AI
d162513
@andrewheard
Update generative-ai-swift dependency
8643806
@andrewheard
Use Swift 5.9 AccessLevelOnImport
eae8c94
@andrewheard
Set Vertex AI endpoint in RequestOptions
9c99bd1
@andrewheard
Revert "Use Swift 5.9 AccessLevelOnImport"
2224fa7 
This reverts commit af7d783.

# Conflicts:
#	FirebaseVertexAI/Sources/VertexAI.swift
#	Package.swift
@andrewheard
Add alternative API surface that returns GenerativeModel instances
a0b8827
@andrewheard
Add sample apps using Vertex AI
e0e5aed
@andrewheard
Update generative-ai-swift dependency
50d49ea
@andrewheard
Fix optional VertexAIProvider unwrapping
08ccd2a
@andrewheard
Update generative-ai-swift dependency
3fbd4e3
@andrewheard
Prototype and sample fixes
1bf861c
@paulb777
Update FirebaseAppCheck's FirebaseCore dependency (#12925)
d9f9382
@ncooke3
[Firestore] Cleanup compilation guards for building on older SDKs (#1…
8e2c7b7 
…2936)
@ncooke3
[Messaging] Cleanup compilation guards for building on older SDKs (#1…
a2d205c 
…2935)
@ncooke3
[Infra] Attempt to fix #12769 (#12938)
07c7c34
@ncooke3
[NFC] Remove outdated comment (#12940)
b37e061
@ncooke3
[Infra] Re-enable 'zip / quickstart_framework_firestore' job
9c4f485
@ncooke3
Revert "[Infra] Re-enable 'zip / quickstart_framework_firestore' job"
49858cf 
This reverts commit 9c4f485.
@ncooke3
[FIAM] Cleanup compilation guards for building on older SDKs (#12937)
38aabb1
@ncooke3
[Infra] Clean up visionOS conditionals (#12934)
554255a
@ncooke3
[Infra] Re-enable 'zip / quickstart_framework_firestore' job (#12943)
520fb3e
@andrewheard @paulb777
@peterfriese @ryanwilson
Fork google-generative-ai for Firebase (#12564)
50d0d29 
Co-authored-by: Morgan Chen <[email protected]>
Co-authored-by: Paul Beusterien <[email protected]>
Co-authored-by: Peter Friese <[email protected]>
Co-authored-by: Ryan Wilson <[email protected]>
@andrewheard
Use forked google-generative-ai in Vertex AI samples (#12574)
92f6a1d
@andrewheard
Add CI workflow for Vertex AI (#12577)
8af3734
@andrewheard @paulb777
@peterfriese @ryanwilson
Fork generative-ai-swift tests for Vertex AI (#12584)
f0d31ea 
Co-authored-by: Morgan Chen <[email protected]>
Co-authored-by: Paul Beusterien <[email protected]>
Co-authored-by: Peter Friese <[email protected]>
Co-authored-by: Ryan Wilson <[email protected]>
@morganchen12 @andrewheard
Add local App Check package to sample targets (#12576)
f2760d4
@andrewheard
Use generative-ai-swift tests in Vertex AI (#12585)
23a1feb
@andrewheard
Add App Check tests in GenerativeModelTests (#12590)
4f44ef2
@andrewheard
Make generativeModel an instance method of VertexAI (#12599)
af52205
@ncooke3
Copy link
Member

ncooke3 commented May 29, 2024

Is this just a result of:

git fetch origin
git checkout auth-swift
git pull
git checkout -b  pb-merge-main-529
git merge main
# resolve conflicts and commit

?

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 29, 2024 •
edited
Loading

Apple API Diff Report

Commit: a8df55c
Last updated: Wed May 29 16:11 PDT 2024
View workflow logs & download artifacts

[BUILD ERROR] FirebaseSharedSwift

@paulb777
Copy link
Member Author

Yes.

@ncooke3
Copy link
Member

ncooke3 commented May 29, 2024

The SPM failures will be fixed by #13016. I don't quite understand the cocoapods-integration / tests (pull_request) failure.

@paulb777
Copy link
Member Author

I'll disregard the failures that will be fixed by #13016.

a5c6721 should fix the CocoaPods integration tests

@paulb777 paulb777 merged commit a5c6721 into auth-swift May 29, 2024
450 of 467 checks passed
@paulb777 paulb777 deleted the pb-merge-main-529 branch May 29, 2024 23:24
@firebase firebase locked and limited conversation to collaborators Jul 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
api: analytics api: appcheck api: appdistribution api: auth api: core api: crashlytics api: database api: dynamiclinks api: firestore api: functions api: inappmessaging Firebase In App Messaging api: installations api: messaging api: performance api: remoteconfig api: storage public-api-change release-tooling
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@paulb777 @ncooke3 @google-oss-bot @andrewheard @morganchen12 @1998code @samedson @tsunghung @yakovmanshin