Skip to content

Commit 34766e7

Browse files
ncooke3paulb777jonsimantov
authored
[v9] Merge release-9.0 into master (#9762)
* Missing NSObject overrides and tests (#9715) * Fix an issue with StorageUploadTask.resume accidentally using Download. (#9717) (#9718) Co-authored-by: Jon Simantov <[email protected]> * [v9] Improve clarity of zip integration instructions (#9720) * [skip ci] Update zip README * [skip ci] Update zip README (2) * Fix Storage Pod-lib-lint failures on Xcode 13.3.1 (#9748) * [v9] Cherry-pick Firestore build fix for Xcode 13.3.1 into `release-9.0` (#9747) * Fix build errors in Xcode 13.3.1 (#9705) * googletest.cmake: remove GIT_SHALLOW when cloning (#9712) Co-authored-by: Denver Coneybeare <[email protected]> * Bump SPM GTMSessionFetcher dep to 1.7.2 (#9753) Co-authored-by: Paul Beusterien <[email protected]> Co-authored-by: Jon Simantov <[email protected]>
1 parent 0bdc148 commit 34766e7

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

.github/workflows/storage.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,16 @@ jobs:
114114
pod-lib-lint:
115115
# Don't run on private repo unless it is a PR.
116116
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
117-
runs-on: macos-11
117+
runs-on: macos-12
118118
strategy:
119119
matrix:
120120
target: [ios, tvos, macos, watchos]
121121
podspec: [FirebaseStorage.podspec, FirebaseStorageInternal.podspec]
122122
steps:
123123
- uses: actions/checkout@v2
124+
- uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
125+
with:
126+
ruby-version: '2.7'
124127
- name: Setup Bundler
125128
run: scripts/setup_bundler.sh
126129
- name: Build and test

FirebaseStorage.podspec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas
3535
s.source_files = [
3636
'FirebaseStorage/Sources/*.swift',
3737
'FirebaseStorage/Typedefs/*.h',
38-
'FirebaseAppCheck/Interop/*.h',
39-
'FirebaseAuth/Interop/*.h',
4038
]
4139

4240
s.dependency 'FirebaseStorageInternal', '~> 9.0'

Firestore/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
- [fixed] Fixed build errors in Xcode 13.3.1 (#9702).
33

44
# v9.0.0
5+
- [fixed] Fixed CMake build errors when building with Xcode 13.3.1 (#9702).
56
- [fixed] **Breaking change:** Fixed an issue where returning `nil` from the
67
update closure when running a transaction caused a crash in Swift by removing
78
the auto-generated `async throw`ing method from the `FirebaseFirestore`

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ let package = Package(
165165
.package(
166166
name: "GTMSessionFetcher",
167167
url: "https://github.com/google/gtm-session-fetcher.git",
168-
"1.7.1" ..< "2.0.0"
168+
"1.7.2" ..< "2.0.0"
169169
),
170170
.package(
171171
name: "nanopb",

cmake/external/googletest.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ ExternalProject_Add(
3737
TEST_COMMAND ""
3838

3939
HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
40-
)
40+
)

0 commit comments

Comments
 (0)