Skip to content

Add FXIOS-10570 Upgrade Sentry to 8.36.0 and switch to Sentry-Dynamic framework for Firefox for iOS and Focus (backport #23142)#23334

Merged
DonalMe merged 2 commits intorelease/v133from
mergify/bp/release/v133/pr-23142
Nov 28, 2024
Merged

Add FXIOS-10570 Upgrade Sentry to 8.36.0 and switch to Sentry-Dynamic framework for Firefox for iOS and Focus (backport #23142)#23334
DonalMe merged 2 commits intorelease/v133from
mergify/bp/release/v133/pr-23142

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Nov 22, 2024

📜 Tickets

Jira ticket
Github issue

💡 Description

Upgrade Sentry to 8.36.0 and switch to Sentry-Dynamic framework for Firefox for iOS and Focus as per instructions from Sentry.

📝 Checklist

You have to check all boxes before merging

  • Filled in the above information (tickets numbers and description of your work)
  • Updated the PR name to follow our PR naming guidelines
  • Wrote unit tests and/or ensured the tests suite is passing
  • When working on UI, I checked and implemented accessibility (minimum Dynamic Text and VoiceOver)
  • If needed, I updated documentation / comments for complex code and public methods
  • If needed, added a backport comment (example @Mergifyio backport release/v120)

This is an automatic backport of pull request #23142 done by [Mergify](https://mergify.com).

… framework for Firefox for iOS and Focus (#23142)

* Upgrade Firefox for iOS Sentry to 8.36.0 and switch to Sentry-Dynamic framework.

* Upgrade Focus Sentry to 8.36.0 and switch to Sentry-Dynamic framework.

(cherry picked from commit eb15e27)

# Conflicts:
#	firefox-ios/Client.xcodeproj/project.pbxproj
@mergify mergify Bot added the conflicts label Nov 22, 2024
@mergify mergify Bot requested a review from a team as a code owner November 22, 2024 18:11
@mergify mergify Bot requested review from dataports and removed request for a team November 22, 2024 18:11
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Nov 22, 2024

Cherry-pick of eb15e27 has failed:

On branch mergify/bp/release/v133/pr-23142
Your branch is up to date with 'origin/release/v133'.

You are currently cherry-picking commit eb15e273b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   BrowserKit/Package.swift
	modified:   firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
	modified:   focus-ios/Blockzilla.xcodeproj/project.pbxproj
	modified:   focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   firefox-ios/Client.xcodeproj/project.pbxproj

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ih-codes ih-codes added weekly-release Tagging backports for rapid release and removed conflicts labels Nov 25, 2024
@ih-codes ih-codes requested a review from OrlaM November 25, 2024 22:15
@mobiletest-ci-bot
Copy link
Copy Markdown

Messages
📖 Edited 5 files
📖 Created 0 files

Generated by 🚫 Danger Swift against 5e12239

Copy link
Copy Markdown
Contributor

@DonalMe DonalMe left a comment

Choose a reason for hiding this comment

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

Approved for 133.1

@DonalMe DonalMe removed the request for review from OrlaM November 28, 2024 16:52
@DonalMe DonalMe merged commit ad9ae72 into release/v133 Nov 28, 2024
@DonalMe DonalMe deleted the mergify/bp/release/v133/pr-23142 branch November 28, 2024 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

weekly-release Tagging backports for rapid release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants