Skip to content

Automatic merge of main into feature_branch/ump-sdk - Sep 11, 2023 #1442

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

Merged
merged 23 commits into from
Sep 11, 2023
Merged

Automatic merge of main into feature_branch/ump-sdk - Sep 11, 2023 #1442

Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e0c330d
iOS: Remove Analytics dependency from GMA integration test (#1386)
jonsimantov Jul 19, 2023
3cd0dca
Add stub workflow for updating feature branches.
jonsimantov Jul 20, 2023
00eeac8
Add script to merge main into all active feature branches on a regula…
jonsimantov Jul 23, 2023
b5e5477
Increase retry. (#1402)
jonsimantov Jul 24, 2023
b9a53cf
Add Firestore test history report (#1403)
jonsimantov Jul 25, 2023
daf92c8
Revert "OR Query Implementation (#1335)" (#1399)
tom-andersen Jul 28, 2023
27a10bc
Wrap the real-time RemoteConfig test in flaky-block to automatically …
AlmostMatt Jul 31, 2023
ed42949
Merge branch 'feature_branch/ump-sdk' into main
jonsimantov Jul 31, 2023
9ac8881
Update the iOS version used by FTL (#1408)
a-maurice Jul 31, 2023
f8b6a36
Kick off nightly packaging an hour earlier (#1409)
a-maurice Aug 2, 2023
18367c0
Fix crash on gma::Initialize without a Firebase App (#1320)
AlmostMatt Aug 2, 2023
505f12e
build: pass along the CMake path (#1410)
compnerd Aug 3, 2023
5df80a2
Add log to gsutil fetch. (#1411)
jonsimantov Aug 3, 2023
3002ff4
Update mobile dependencies - Thu Aug 03 2023 (#1413)
firebase-workflow-trigger[bot] Aug 6, 2023
f198c6f
feat(auth): Add emulator support (#1400)
cynthiajoan Aug 6, 2023
f84253e
Update merge-to-main script (#1420)
jonsimantov Aug 7, 2023
64d5d42
Update release version number for M135, 11.4.0 (#1421)
AlmostMatt Aug 8, 2023
669b0fb
feat(auth): enable emulator support on desktop (#1423)
cynthiajoan Aug 10, 2023
86198bb
Internal Updates. (#1422)
nakirekommula Aug 10, 2023
7a19a44
Add Analytics function for on-device conversion (#1429)
a-maurice Aug 21, 2023
ca5cdee
Update mobile dependencies - Tue Aug 29 2023 (#1436)
firebase-workflow-trigger[bot] Aug 30, 2023
f55c43c
add UseEmulator api to auth (#1437)
cynthiajoan Aug 31, 2023
18d57fd
Merge branch 'feature_branch/ump-sdk' into workflow/auto-merge-featur…
jonsimantov Sep 11, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ios_pod/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use_frameworks!

target 'GetPods' do
pod 'Firebase/Core', '10.14.0'

pod 'Google-Mobile-Ads-SDK', '10.9.0'
pod 'GoogleUserMessagingPlatform', '2.1.0'
pod 'Firebase/Analytics', '10.14.0'
Expand Down