Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions FirebaseCore/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@
- [removed] **Breaking change**: Removed the following unused API.
- `Options.androidClientID`
- `Options.trackingID`
- [removed] **Breaking change**: Firebase's zip and Carthage distributions of
the Google Mobile Ads SDK has been removed. Instead, the Google
Mobile Ads SDK binary distribution should be accessed from
https://developers.google.com/admob/ios/download. Note that _any existing
versions of the Firebase zip or Carthage distributions will
continue to be available and functional_. Learn more about this change
in our FAQ: https://firebase.google.com/support/faq/#admob-which-sdk. (#14408)
- [removed] The deprecated Vertex AI in Firebase SDK (`FirebaseVertexAI`) has
been removed. It has been replaced by the Firebase AI Logic
SDK (`FirebaseAI`) to
Expand Down
2 changes: 0 additions & 2 deletions ReleaseTooling/Sources/ZipBuilder/CarthageUtils.swift
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,6 @@ extension CarthageUtils {
var jsonFileName: String
if product == "GoogleSignIn" {
jsonFileName = "FirebaseGoogleSignIn"
} else if product == "Google-Mobile-Ads-SDK" {
jsonFileName = "FirebaseAdMob"
} else {
jsonFileName = product
}
Expand Down
8 changes: 2 additions & 6 deletions ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -369,11 +369,8 @@ struct ZipBuilder {
guard !podsToInstall.isEmpty else {
fatalError("Failed to find versions for Firebase release")
}
// We don't release Google-Mobile-Ads-SDK and GoogleSignIn, but we include their latest
// We don't release GoogleSignIn, but we include its latest
// version for convenience in the Zip and Carthage builds.
podsToInstall.append(CocoaPodUtils.VersionedPod(name: "Google-Mobile-Ads-SDK",
version: nil,
platforms: ["ios"]))
podsToInstall.append(CocoaPodUtils.VersionedPod(name: "GoogleSignIn",
version: nil,
platforms: ["ios"]))
Expand Down Expand Up @@ -486,8 +483,7 @@ struct ZipBuilder {

// Skip Analytics and the pods bundled with it.
let remainingPods = installedPods.filter {
$0.key == "Google-Mobile-Ads-SDK" ||
$0.key == "GoogleSignIn" ||
$0.key == "GoogleSignIn" ||
(firebaseZipPods.contains($0.key) &&
$0.key != "FirebaseAnalytics" &&
$0.key != "Firebase" &&
Expand Down
Loading