-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Merge release-10.26
into main
#12954
Conversation
This reverts commit af7d783. # Conflicts: # FirebaseVertexAI/Sources/VertexAI.swift # Package.swift
Co-authored-by: Paul Beusterien <paulbeusterien@google.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM on green
Note to merge from the command line to bring git history to main
@@ -79,7 +79,7 @@ jobs: | |||
env: | |||
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} | |||
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} | |||
runs-on: macos-12 # TODO: the legacy ObjC quickstarts don't run with Xcode 15. | |||
runs-on: macos-14 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure why this change is here, but ok if it passes CI.
Closing in favour of #12955 (added co-authors from https://github.com/google-gemini/generative-ai-swift). |
Merging the branch for https://github.com/firebase/firebase-ios-sdk/releases/tag/10.26.0 into
main
.Note: Added commit to update
firebaseVersion
to10.27.0
inPackage.swift
to avoid merge conflict withmain
(release-10.26...ah/release-10.26-merge).