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

Merge release-10.26 into main #12954

Closed
wants to merge 72 commits into from
Closed

Merge release-10.26 into main #12954

wants to merge 72 commits into from

Conversation

andrewheard
Copy link
Contributor

Merging the branch for https://github.com/firebase/firebase-ios-sdk/releases/tag/10.26.0 into main.

Note: Added commit to update firebaseVersion to 10.27.0 in Package.swift to avoid merge conflict with main (release-10.26...ah/release-10.26-merge).

andrewheard and others added 30 commits April 30, 2024 17:37
This reverts commit af7d783.

# Conflicts:
#	FirebaseVertexAI/Sources/VertexAI.swift
#	Package.swift
andrewheard and others added 20 commits May 1, 2024 11:48
Co-authored-by: Paul Beusterien <paulbeusterien@google.com>
@google-oss-bot google-oss-bot added api: core api: inappmessaging Firebase In App Messaging labels May 13, 2024
@andrewheard andrewheard added this to the 10.27.0 - M148 milestone May 13, 2024
@andrewheard andrewheard marked this pull request as ready for review May 13, 2024 15:37
Copy link
Member

@paulb777 paulb777 left a 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
Copy link
Member

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.

@andrewheard
Copy link
Contributor Author

Closing in favour of #12955 (added co-authors from https://github.com/google-gemini/generative-ai-swift).

@firebase firebase locked and limited conversation to collaborators Jun 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants