Skip to content
Closed

WIP #1939

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 @@ -587,8 +587,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
kind = revision;
revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
kind = revision;
revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -615,8 +615,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
kind = revision;
revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
kind = revision;
revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
};
};
/* 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 dc6dfd442b1f3ec215ed62b8beb2623ffab010d6)

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
--- 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
Original file line number Diff line number Diff line change
Expand Up @@ -597,8 +597,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
kind = revision;
revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -608,8 +608,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
kind = revision;
revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -919,8 +919,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
kind = revision;
revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -615,8 +615,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
kind = revision;
revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
kind = revision;
revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
};
};
/* 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", revision: "dc6dfd442b1f3ec215ed62b8beb2623ffab010d6"),
.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 @@ -604,8 +604,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
kind = revision;
revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -589,8 +589,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
kind = revision;
revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
kind = revision;
revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 13.0.1;
kind = revision;
revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
};
};
1ABAD42B030000000002 /* XCRemoteSwiftPackageReference "swift-package-manager-google-user-messaging-platform" */ = {
Expand Down
Loading