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

Add Vertex AI Preview SDK #12880

Merged
merged 53 commits into from
May 1, 2024
Merged

Add Vertex AI Preview SDK #12880

merged 53 commits into from
May 1, 2024

Conversation

andrewheard
Copy link
Contributor

Added the Firebase Vertex AI Preview SDK to prepare for the 10.26.0 release.

The branch ah/vertex-ai is a rebase of vertex-ai onto release-10.26.

Diffs `% git diff vertex-ai..ah/vertex-ai -- FirebaseVertexAI` > No output

git diff vertex-ai..ah/vertex-ai -- Package.swift

diff --git a/Package.swift b/Package.swift
index 773abb0ef..440820d45 100644
--- a/Package.swift
+++ b/Package.swift
@@ -19,7 +19,7 @@
 import class Foundation.ProcessInfo
 import PackageDescription

-let firebaseVersion = "0.1.0-vertexai-preview"
+let firebaseVersion = "10.26.0"

 let package = Package(
   name: "Firebase",
@@ -176,7 +176,6 @@ let package = Package(
       url: "https://github.com/paulb777/ocmock.git",
       revision: "173955e93e6ee6999a10729ab67e4b4efdd1db6d"
     ),
-//    .package(
 //      url: "https://github.com/erikdoe/ocmock.git",
 //      revision: "c5eeaa6dde7c308a5ce48ae4d4530462dd3a1110"
 //    ),
@@ -192,7 +191,7 @@ let package = Package(
       url: "https://github.com/google/interop-ios-for-google-sdks.git",
       "100.0.0" ..< "101.0.0"
     ),
-    .package(url: "https://github.com/google/app-check.git", "10.18.0" ..< "11.0.0"),
+    .package(url: "https://github.com/google/app-check.git", "10.19.0" ..< "11.0.0"),
   ],
   targets: [
     .target(
@@ -324,8 +323,8 @@ let package = Package(
     ),
     .binaryTarget(
       name: "FirebaseAnalytics",
-      url: "https://dl.google.com/firebase/ios/swiftpm/10.24.0/FirebaseAnalytics.zip",
-      checksum: "6b5e1d250f73c18cc1548235e7e88c0eb8d3ed82accbc92d0706f9791ade28e5"
+      url: "https://dl.google.com/firebase/ios/swiftpm/10.25.0/FirebaseAnalytics.zip",
+      checksum: "b2a313c4d58a6eee38b4e5b50462a889fbeb5bc9c1fd35d5f1579ec8e0b68463"
     ),
     .target(
       name: "FirebaseAnalyticsSwiftTarget",
@@ -1403,7 +1402,7 @@ func googleAppMeasurementDependency() -> Package.Dependency {
     return .package(url: appMeasurementURL, branch: "main")
   }

-  return .package(url: appMeasurementURL, exact: "10.24.0")
+  return .package(url: appMeasurementURL, exact: "10.25.0")
 }

 func abseilDependency() -> Package.Dependency {
@@ -1573,8 +1572,8 @@ func firestoreTargets() -> [Target] {
     } else {
       return .binaryTarget(
         name: "FirebaseFirestoreInternal",
-        url: "https://dl.google.com/firebase/ios/bin/firestore/10.24.0/rc0/FirebaseFirestoreInternal.zip",
-        checksum: "d503fea5b9dcb02dfddd0df85c4353890d49b93e9fd38b79badae151eab62931"
+        url: "https://dl.google.com/firebase/ios/bin/firestore/10.25.0/rc0/FirebaseFirestoreInternal.zip",
+        checksum: "afa9ec6af0712406a1fcd4a69d01d31156308de23d3a8e2622721c72fd72485e"
       )
     }
   }()

#no-changelog

andrewheard and others added 30 commits May 1, 2024 11:45
This reverts commit af7d783.

# Conflicts:
#	FirebaseVertexAI/Sources/VertexAI.swift
#	Package.swift
paulb777 and others added 23 commits May 1, 2024 11:47
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.

Some weird things in the diff that aren't really changes from main - probably related to cherry-picking.

LGTM on green

Please merge from the command line so we end up with the commit history in main

@andrewheard
Copy link
Contributor Author

Some weird things in the diff that aren't really changes from main - probably related to cherry-picking.

@paulb777 Agreed that it's likely from the cherry-picking. I also noticed some weird things when diffing vertex-ai...ah/vertex-ai in the GitHub web UI that I don't see locally, e.g., FirebaseVertexAI/Tests/Unit/GenerateContentResponses/unary-failure-image-rejected.json shows as a new file despite existing in both vertex-ai and ah/vertex-ai.

@andrewheard andrewheard merged commit d675a68 into release-10.26 May 1, 2024
107 checks passed
@andrewheard andrewheard deleted the ah/vertex-ai branch May 1, 2024 19:52
@firebase firebase locked and limited conversation to collaborators Jun 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants