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.

Sign up for GitHub

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

Upgrade grpc for cocoapods #11866

Closed
wants to merge 22 commits into from
Closed

Upgrade grpc for cocoapods #11866

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2610889
upgrade grpc to 1.57.0
wu-hui Aug 21, 2023
83b0fdd
upgrade grpc to 1.57.0
wu-hui Aug 21, 2023
aaf3ef0
cmake change
wu-hui Aug 21, 2023
b721463
Merge branch 'master' into wuandy/GRPC157
wu-hui Aug 30, 2023
29eb36f
Merge branch 'wuandy/GRPC157' of github.com:firebase/firebase-ios-sdk…
wu-hui Aug 30, 2023
f7586c7
Revert "cmake change"
wu-hui Aug 30, 2023
ea891b3
bring cmake back
wu-hui Aug 30, 2023
12f86c6
Fix cocoapods build
wu-hui Sep 1, 2023
69d3473
Revert "bring cmake back"
wu-hui Sep 1, 2023
0657afc
Cmake fix
wu-hui Sep 1, 2023
2d427fa
Revert "Revert "bring cmake back""
wu-hui Sep 1, 2023
ea17324
1.52 first
wu-hui Sep 1, 2023
66e6fb0
Fix internal grpccpp api usage
wu-hui Sep 5, 2023
577db94
Remove grpc-core
wu-hui Sep 6, 2023
5ca452e
Fix cocoapods but breaking?
wu-hui Sep 27, 2023
bf8a875
Merge branch 'master' into wuandy/GRPC157
wu-hui Sep 27, 2023
9a21dff
fix pbxproj
wu-hui Sep 27, 2023
3340024
try fix build script
wu-hui Sep 28, 2023
95ce047
Merge branch 'master' into wuandy/GRPC157
wu-hui Sep 28, 2023
6af7999
Try fixing ios build
wu-hui Sep 28, 2023
777c620
revert spm change
wu-hui Sep 28, 2023
49146a1
trying luck with protobuf
wu-hui Sep 28, 2023
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
6 changes: 4 additions & 2 deletions FirebaseFirestore.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,

s.dependency 'FirebaseCore', '~> 10.0'

abseil_version = '~> 1.20211102.0'
abseil_version = '~> 1.20230125.3'
s.dependency 'abseil/algorithm', abseil_version
s.dependency 'abseil/base', abseil_version
s.dependency 'abseil/container/flat_hash_map', abseil_version
Expand All @@ -100,7 +100,9 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
s.dependency 'abseil/time', abseil_version
s.dependency 'abseil/types', abseil_version

s.dependency 'gRPC-C++', '~> 1.44.0'
s.dependency 'gRPC', '~> 1.57.0'
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI I think you'll need to upgrade grpc to at least 1.59.0 in order to pick up the iOS 12 crash fix (grpc/grpc#34416). 1.59.0 is in "prerelease" at the time of writing. Presumably, it will be officially released in the next few weeks.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, this is only to test if we can upgrade at all. Will do 1.59 later.

s.dependency 'gRPC-Core', '~> 1.57.0'
s.dependency 'gRPC-C++', '~> 1.57.0'
s.dependency 'leveldb-library', '~> 1.22'
s.dependency 'nanopb', '>= 2.30908.0', '< 2.30910.0'

Expand Down
287 changes: 89 additions & 198 deletions Firestore/Example/Firestore.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 9 additions & 13 deletions Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_Example_iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6003F589195388D20070C39A"
BuildableName = "Firestore_Example_iOS.app"
BlueprintName = "Firestore_Example_iOS"
ReferencedContainer = "container:Firestore.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand Down Expand Up @@ -59,17 +68,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6003F589195388D20070C39A"
BuildableName = "Firestore_Example_iOS.app"
BlueprintName = "Firestore_Example_iOS"
ReferencedContainer = "container:Firestore.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -91,8 +89,6 @@
ReferencedContainer = "container:Firestore.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
22 changes: 9 additions & 13 deletions ...store/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_Example_macOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DAFF0CF421E64AC30062958F"
BuildableName = "Firestore_Example_macOS.app"
BlueprintName = "Firestore_Example_macOS"
ReferencedContainer = "container:Firestore.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -49,17 +58,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DAFF0CF421E64AC30062958F"
BuildableName = "Firestore_Example_macOS.app"
BlueprintName = "Firestore_Example_macOS"
ReferencedContainer = "container:Firestore.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -81,8 +79,6 @@
ReferencedContainer = "container:Firestore.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
10 changes: 2 additions & 8 deletions Firestore/Example/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ source 'https://github.com/firebase/SpecsDev.git'
source 'https://github.com/firebase/SpecsStaging.git'
source 'https://cdn.cocoapods.org/'

use_frameworks!
use_modular_headers!
# use_frameworks!

install! 'cocoapods',
:generate_multiple_pod_projects => true,
Expand Down Expand Up @@ -123,13 +124,6 @@ if is_platform(:ios)

pod 'leveldb-library'
end

target 'Firestore_FuzzTests_iOS' do
inherit! :search_paths
platform :ios, '11.0'

pod 'LibFuzzer', :podspec => 'LibFuzzer.podspec', :inhibit_warnings => true
end
end
end

Expand Down
Loading