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
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
version = 13.1.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
version = 13.1.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
version = 13.1.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
version = 13.1.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
2 changes: 1 addition & 1 deletion cmake/external/firestore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ endif()

# If the format of the line below changes, then be sure to update
# https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81
set(version 13.0.1)
set(version 13.1.1)

function(GetReleasedDep)
message("Getting released firebase-ios-sdk @ ${version}")
Expand Down
12 changes: 0 additions & 12 deletions cmake/external/firestore.patch.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@ index 920bf2928..c5c9cc7ee 100644

ExternalProject_Get_property(snappy SOURCE_DIR)
set(snappy_source_dir "${SOURCE_DIR}")
diff --git a/Firestore/core/src/util/ordered_code.h b/Firestore/core/src/util/ordered_code.h

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this change

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They have merged a fix in upstream in the firestore and it causes a cmake conflict if this not removed

--- a/Firestore/core/src/util/ordered_code.h
+++ b/Firestore/core/src/util/ordered_code.h
@@ -39,7 +39,8 @@
#ifndef FIRESTORE_CORE_SRC_UTIL_ORDERED_CODE_H_
#define FIRESTORE_CORE_SRC_UTIL_ORDERED_CODE_H_

+#include <cstdint>
#include <string>

#include "absl/strings/string_view.h"

diff --git a/Firestore/core/src/util/quadruple.cc b/Firestore/core/src/util/quadruple.cc
--- a/Firestore/core/src/util/quadruple.cc
+++ b/Firestore/core/src/util/quadruple.cc
Expand Down
6 changes: 3 additions & 3 deletions cpp_sdk_version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"released": "14.0.0",
"stable": "14.0.0",
"head": "14.0.0"
"released": "14.0.1",
"stable": "14.0.1",
"head": "14.0.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
version = 13.1.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
version = 13.1.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
version = 13.1.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
version = 13.1.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
version = 13.1.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
2 changes: 1 addition & 1 deletion ios_spm/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ let package = Package(
.library(name: "FirebaseDependencies", targets: ["FirebaseDependencies"]),
],
dependencies: [
.package(url: "https://github.com/firebase/firebase-ios-sdk.git", exact: "13.0.1"),
.package(url: "https://github.com/firebase/firebase-ios-sdk.git", exact: "13.1.1"),
.package(url: "https://github.com/googleads/swift-package-manager-google-user-messaging-platform.git", exact: "3.1.0"),
],
targets: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
version = 13.1.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
63 changes: 32 additions & 31 deletions release_build_files/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,45 +219,45 @@ Feature | Required Frameworks and Cocoapods
-------------------------- | ---------------------------------------
Firebase Analytics | firebase_analytics.xcframework
| | firebase.xcframework
| | Firebase/Analytics (13.0.1)
| | Firebase/Analytics (13.1.1)
Firebase App Check | firebase_app_check.xcframework
| | firebase.xcframework
| | Firebase/AppCheck (13.0.1)
| | Firebase/AppCheck (13.1.1)
Firebase Authentication | firebase_auth.xcframework
| | firebase.xcframework
| | Firebase/Auth (13.0.1)
| | Firebase/Auth (13.1.1)
Cloud Firestore | firebase_firestore.xcframework
| | firebase_auth.xcframework
| | firebase.xcframework
| | Firebase/Firestore (13.0.1)
| | Firebase/Auth (13.0.1)
| | Firebase/Firestore (13.1.1)
| | Firebase/Auth (13.1.1)
Firebase Functions | firebase_functions.xcframework
| | firebase_auth.xcframework (optional)
| | firebase.xcframework
| | Firebase/Functions (13.0.1)
| | Firebase/Auth (13.0.1)
| | Firebase/Functions (13.1.1)
| | Firebase/Auth (13.1.1)
Firebase Installations | firebase_installations.xcframework
| | firebase.xcframework
| | FirebaseInstallations (13.0.1)
| | Firebase/Installations (13.1.1)
Firebase Cloud Messaging | firebase_messaging.xcframework
| | firebase.xcframework
| | Firebase/Messaging (13.0.1)
| | Firebase/Messaging (13.1.1)
Firebase Realtime Database | firebase_database.xcframework
| | firebase_auth.xcframework
| | firebase.xcframework
| | Firebase/Database (13.0.1)
| | Firebase/Auth (13.0.1)
| | Firebase/Database (13.1.1)
| | Firebase/Auth (13.1.1)
Firebase Remote Config | firebase_remote_config.xcframework
| | firebase.xcframework
| | Firebase/RemoteConfig (13.0.1)
| | Firebase/RemoteConfig (13.1.1)
Firebase Storage | firebase_storage.xcframework
| | firebase_auth.xcframework
| | firebase.xcframework
| | Firebase/Storage (13.0.1)
| | Firebase/Auth (13.0.1)
| | Firebase/Storage (13.1.1)
| | Firebase/Auth (13.1.1)
User Messaging Platform | firebase_ump.xcframework
| | firebase.xcframework
| | Firebase/CoreOnly (13.0.1)
| | Firebase/CoreOnly (13.1.1)
| | GoogleUserMessagingPlatform (3.1.0)

Important: Each version of the Firebase C++ SDK supports a specific version of
Expand All @@ -278,45 +278,45 @@ Feature | Required Libraries and Cocoapods
-------------------------- | -----------------------------------------
Firebase Analytics | libfirebase_analytics.a
| | libfirebase_app.a
| | Firebase/Analytics (13.0.1)
| | Firebase/Analytics (13.1.1)
Firebase App Check | firebase_app_check.xcframework
| | firebase.xcframework
| | Firebase/AppCheck (13.0.1)
| | Firebase/AppCheck (13.1.1)
Firebase Authentication | libfirebase_auth.a
| | libfirebase_app.a
| | Firebase/Auth (13.0.1)
| | Firebase/Auth (13.1.1)
Cloud Firestore | libfirebase_firestore.a
| | libfirebase_app.a
| | libfirebase_auth.a
| | Firebase/Firestore (13.0.1)
| | Firebase/Auth (13.0.1)
| | Firebase/Firestore (13.1.1)
| | Firebase/Auth (13.1.1)
Firebase Functions | libfirebase_functions.a
| | libfirebase_app.a
| | libfirebase_auth.a (optional)
| | Firebase/Functions (13.0.1)
| | Firebase/Auth (13.0.1)
| | Firebase/Functions (13.1.1)
| | Firebase/Auth (13.1.1)
Firebase Installations | libfirebase_installations.a
| | libfirebase_app.a
| | FirebaseInstallations (13.0.1)
| | Firebase/Installations (13.1.1)
Firebase Cloud Messaging | libfirebase_messaging.a
| | libfirebase_app.a
| | Firebase/CloudMessaging (13.0.1)
| | Firebase/Messaging (13.1.1)
Firebase Realtime Database | libfirebase_database.a
| | libfirebase_app.a
| | libfirebase_auth.a
| | Firebase/Database (13.0.1)
| | Firebase/Auth (13.0.1)
| | Firebase/Database (13.1.1)
| | Firebase/Auth (13.1.1)
Firebase Remote Config | libfirebase_remote_config.a
| | libfirebase_app.a
| | Firebase/RemoteConfig (13.0.1)
| | Firebase/RemoteConfig (13.1.1)
Firebase Storage | libfirebase_storage.a
| | libfirebase_app.a
| | libfirebase_auth.a
| | Firebase/Storage (13.0.1)
| | Firebase/Auth (13.0.1)
| | Firebase/Storage (13.1.1)
| | Firebase/Auth (13.1.1)
User Messaging Platform | libfirebase_ump.a
| | libfirebase_app.a
| | Firebase/CoreOnly (13.0.1)
| | Firebase/CoreOnly (13.1.1)
| | GoogleUserMessagingPlatform (3.1.0)

Important: Each version of the Firebase C++ SDK supports a specific version of
Expand Down Expand Up @@ -613,8 +613,9 @@ workflow use only during the development of your app, not for publicly shipping
code.

## Release Notes
### Upcoming
### 14.0.1
- Changes
- General (iOS): Update to Firebase CocoaPods version 13.1.1.
- [Firestore] Security Update: Removed compromised eMudhra intermediate CA
root certificates from embedded trust store.
([#16930](https://github.com/firebase/firebase-ios-sdk/pull/16930))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
version = 13.1.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
version = 13.1.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
version = 13.1.1;
};
};
1ABAD42B030000000002 /* XCRemoteSwiftPackageReference "swift-package-manager-google-user-messaging-platform" */ = {
Expand Down
Loading