Skip to content

Commit

Permalink
Merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
razvanlitianu committed Jan 28, 2025
2 parents 4a35d10 + 1d9a550 commit 6ca0ae3
Show file tree
Hide file tree
Showing 201 changed files with 1,680 additions and 237 deletions.
44 changes: 30 additions & 14 deletions .github/workflows/update-bitrise-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,24 @@ name: Update Outdated Bitrise Steps Versions

on:
schedule:
- cron: "0 3 * * 0" # Runs every Sunday at 03:00 UTC
- cron: "0 3 * * 0" # Runs every Sunday at 03:00 UTC
workflow_dispatch: # Allow manual triggering

inputs:
branchName:
description: 'Branch used as target for automation'
required: true
default: 'main'
jobs:
update-steps:
runs-on: ubuntu-latest

steps:
# Step 1: Check out the repository
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false
token: ${{ secrets.GITHUB_TOKEN }}

# Step 2: Set up Python
- name: Set up Python
Expand All @@ -34,7 +41,14 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# Step 5: Determine the PR Version Number
- name: Script to check if branch exists to not commit again
run: |-
branch=$(curl -X GET -s -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/mozilla-mobile/firefox-ios/branches?per_page=100 | jq -r '.[].name | select(contains("update-bitrise-steps-${{ env.next_version }}"))')
echo $branch
if [ -z "$branch" ]; then echo "BRANCH_CREATED=false" >> $GITHUB_ENV; else echo "BRANCH_CREATED=true" >> $GITHUB_ENV;fi
# Step 5: Determine PR Version Number
- name: Determine PR Version Number
id: versioning
run: |
Expand All @@ -51,25 +65,28 @@ jobs:
# Step 6: Check for changes
- name: Commit changes if any
if: env.BRANCH_CREATED == 'false'
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git diff
git diff --quiet || (git add bitrise.yml && git commit -m "Update outdated Bitrise steps")
git diff --quiet || (git add bitrise.yml)
# Step 7: Create a Pull Request
- name: Create a Pull Request
uses: peter-evans/create-pull-request@v6
if: env.BRANCH_CREATED == 'false'
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: update/bitrise-steps
commit-message: "Update [v${{ env.next_version }}] outdated Bitrise steps ${{ env.current_date }}"
author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
committer: GitHub <[email protected]>
token: ${{ secrets.GITHUB_TOKEN }}
branch: update-bitrise-steps-${{ env.next_version }}
title: "Bump [v${{ env.next_version }}] Update outdated Bitrise steps ${{ env.current_date }}"
delete-branch: true
body: |
This PR updates the outdated Bitrise steps to their latest versions.
reviewers: mdotb-moz,clarmso,isabelrios

# Step 8: Send a message to slack if there is a failure
reviewers: mdotb-moz,isabelrios,clarmso
# Step 8: Send a message to slack if there is a failure
notify-on-failure:
runs-on: ubuntu-latest
needs: update-steps
Expand All @@ -87,5 +104,4 @@ jobs:
GITHUB_REPOSITORY: ${{ github.repository }}
GITHUB_RUNID: ${{ github.run_id }}
GITHUB_REF_NAME: ${{ github.ref_name }}
GITHUB_SHA: ${{ github.sha }}

GITHUB_SHA: ${{ github.sha }}
22 changes: 21 additions & 1 deletion firefox-ios/Client.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,7 @@
8A0A1BA02B2200FD00E8706F /* PrivateHomepageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A0A1B9F2B2200FD00E8706F /* PrivateHomepageViewController.swift */; };
8A0A1BA32B22030100E8706F /* PrivateMessageCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A0A1BA22B22030100E8706F /* PrivateMessageCardCell.swift */; };
8A0D32842A61E1CC007D976D /* StatusBarOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A0D32832A61E1CC007D976D /* StatusBarOverlay.swift */; };
8A106D632D416F82009AD7E4 /* MessageCardMiddlewareTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A106D622D416F82009AD7E4 /* MessageCardMiddlewareTests.swift */; };
8A11C80F2731916E00AC7318 /* defaultOnlyTestList.json in Resources */ = {isa = PBXBuildFile; fileRef = 8A11C80D2731916E00AC7318 /* defaultOnlyTestList.json */; };
8A11C8112731CFD700AC7318 /* ReaderModeStyleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A11C8102731CFD700AC7318 /* ReaderModeStyleTests.swift */; };
8A11C8132731E54800AC7318 /* DictionaryExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A11C8122731E54800AC7318 /* DictionaryExtensionsTests.swift */; };
Expand Down Expand Up @@ -989,6 +990,8 @@
8AAEBA0B2BF53AF6000C02B5 /* MicrosurveyStateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AAEBA092BF53AB5000C02B5 /* MicrosurveyStateTests.swift */; };
8AB30EC82B6C038600BD9A9B /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 8AB30EC72B6C038600BD9A9B /* Lottie */; };
8AB30ECA2B6C03C700BD9A9B /* DataClearanceAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AB30EC92B6C03C700BD9A9B /* DataClearanceAnimation.swift */; };
8AB53B3A2D4138F200C97590 /* MessageCardMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AB53B392D4138ED00C97590 /* MessageCardMiddleware.swift */; };
8AB53B3E2D41463900C97590 /* MessageCardAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AB53B3D2D41463400C97590 /* MessageCardAction.swift */; };
8AB5958828413F6C0090F4AE /* BookmarksCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AB5958728413F6C0090F4AE /* BookmarksCell.swift */; };
8AB5958A284145B30090F4AE /* HomepageSectionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AB59589284145B30090F4AE /* HomepageSectionHandler.swift */; };
8AB8571D27D929350075C173 /* TopSitesViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AB8571C27D929350075C173 /* TopSitesViewModel.swift */; };
Expand Down Expand Up @@ -3660,6 +3663,8 @@
4320BE4929D1B24B00D0B308 /* kab */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = kab; path = kab.lproj/Onboarding.strings; sourceTree = "<group>"; };
4320DD052D352B5E00FC5C5E /* ml */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ml; path = ml.lproj/SocialShare.strings; sourceTree = "<group>"; };
4320E17E2A16E5A9009A4B5F /* CreditCardExtras.ios.mjs */ = {isa = PBXFileReference; lastKnownFileType = text; path = CreditCardExtras.ios.mjs; sourceTree = "<group>"; };
432106DE2D47A07900D5FA08 /* lo */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lo; path = lo.lproj/FxANotification.strings; sourceTree = "<group>"; };
432106DF2D47A07900D5FA08 /* lo */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lo; path = lo.lproj/KeyboardAccessory.strings; sourceTree = "<group>"; };
43211DCD2C3C045A00E4CA4D /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/EditAddress.strings; sourceTree = "<group>"; };
43211DCE2C3C045A00E4CA4D /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/ScanQRCode.strings; sourceTree = "<group>"; };
43211E6B2C57B11F003F9FAF /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Toolbar.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4350,6 +4355,8 @@
4358857E2B8CAC52003889BD /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/PasswordAutofill.strings; sourceTree = "<group>"; };
4358A23C2CA187A000877339 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/PasswordGenerator.strings"; sourceTree = "<group>"; };
4358B5E12A24BEC2001F379A /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/DisplayCard.strings; sourceTree = "<group>"; };
4358D8392D479FA100C8ED24 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/SocialMediaApp.strings; sourceTree = "<group>"; };
4358D83A2D479FA100C8ED24 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/SocialShare.strings; sourceTree = "<group>"; };
4358DEF72A0BCAED000A7CED /* en-US */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-US"; path = "en-US.lproj/FirefoxSync.strings"; sourceTree = "<group>"; };
4358DEF82A0BCAED000A7CED /* en-US */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-US"; path = "en-US.lproj/Upgrade.strings"; sourceTree = "<group>"; };
4358FE5C29F69A790057F216 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Notification.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -7575,6 +7582,7 @@
8A0D32832A61E1CC007D976D /* StatusBarOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBarOverlay.swift; sourceTree = "<group>"; };
8A0E5F3D2BFBA49400DE052B /* MicrosurveyCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MicrosurveyCoordinatorTests.swift; sourceTree = "<group>"; };
8A0F46E89E106C66C6C29F07 /* bn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bn; path = bn.lproj/ErrorPages.strings; sourceTree = "<group>"; };
8A106D622D416F82009AD7E4 /* MessageCardMiddlewareTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageCardMiddlewareTests.swift; sourceTree = "<group>"; };
8A11C80D2731916E00AC7318 /* defaultOnlyTestList.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = defaultOnlyTestList.json; sourceTree = "<group>"; };
8A11C8102731CFD700AC7318 /* ReaderModeStyleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderModeStyleTests.swift; sourceTree = "<group>"; };
8A11C8122731E54800AC7318 /* DictionaryExtensionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DictionaryExtensionsTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -7835,6 +7843,8 @@
8AAEBA092BF53AB5000C02B5 /* MicrosurveyStateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MicrosurveyStateTests.swift; sourceTree = "<group>"; };
8AB04613B101195AADCC1F1B /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = "cs.lproj/Default Browser.strings"; sourceTree = "<group>"; };
8AB30EC92B6C03C700BD9A9B /* DataClearanceAnimation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataClearanceAnimation.swift; sourceTree = "<group>"; };
8AB53B392D4138ED00C97590 /* MessageCardMiddleware.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageCardMiddleware.swift; sourceTree = "<group>"; };
8AB53B3D2D41463400C97590 /* MessageCardAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageCardAction.swift; sourceTree = "<group>"; };
8AB5958728413F6C0090F4AE /* BookmarksCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksCell.swift; sourceTree = "<group>"; };
8AB59589284145B30090F4AE /* HomepageSectionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomepageSectionHandler.swift; sourceTree = "<group>"; };
8AB8571C27D929350075C173 /* TopSitesViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopSitesViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -11756,6 +11766,7 @@
isa = PBXGroup;
children = (
8AED23072D4012B1000FF624 /* MessageCardStateTests.swift */,
8A106D622D416F82009AD7E4 /* MessageCardMiddlewareTests.swift */,
8AEF41612D15EDBA0013925D /* TopSitesMiddlewareTests.swift */,
8A552AC62CB43AB300564C98 /* HeaderStateTests.swift */,
8A552AC52CB43AB300564C98 /* HomepageStateTests.swift */,
Expand Down Expand Up @@ -12344,6 +12355,8 @@
8AED23022D400020000FF624 /* MessageCard */ = {
isa = PBXGroup;
children = (
8AB53B3D2D41463400C97590 /* MessageCardAction.swift */,
8AB53B392D4138ED00C97590 /* MessageCardMiddleware.swift */,
8AED23032D40002A000FF624 /* MessageCardState.swift */,
8AED23052D400098000FF624 /* HomepageMessageCardCell.swift */,
);
Expand Down Expand Up @@ -16586,6 +16599,7 @@
F85C7F0E2711C556004BDBA4 /* SettingsViewController.swift in Sources */,
0BDDB3442CA6E43100D501DF /* FolderHierarchyFetcher.swift in Sources */,
C8B509E3293FA39900AC013C /* AppVersionUpdateCheckerProtocol.swift in Sources */,
8AB53B3E2D41463900C97590 /* MessageCardAction.swift in Sources */,
E1AFBAF9292EA0330065E35E /* SendToDeviceHelper.swift in Sources */,
E17798982BD6B44B00F6F0EB /* AddressToolbarContainer.swift in Sources */,
21D151262AFC28960062D891 /* TabManagerMiddleware.swift in Sources */,
Expand Down Expand Up @@ -17101,6 +17115,7 @@
612194E82CE50A9B001664BB /* WallpaperState.swift in Sources */,
DAE6DF1B29AD78DA0094BD1B /* BrowserViewController+ZoomPage.swift in Sources */,
0EC57D082CA6FCA5002E3F04 /* PasswordGeneratorHeaderView.swift in Sources */,
8AB53B3A2D4138F200C97590 /* MessageCardMiddleware.swift in Sources */,
8AB8574A27D97CE90075C173 /* HomePanelDelegate.swift in Sources */,
2137786529832C8900D01309 /* OverlayModeManager.swift in Sources */,
8AF99B4D29EF076800108DEC /* WebviewViewController.swift in Sources */,
Expand Down Expand Up @@ -17646,6 +17661,7 @@
8A635ECD289437A8006378BA /* SyncedTabCellTests.swift in Sources */,
8A97E6EF2C584C4900F94793 /* AddressLocaleFeatureValidatorTests.swift in Sources */,
8ABE9F1D2CB462730080E1DF /* RemoteSettingsFetchConfigTests.swift in Sources */,
8A106D632D416F82009AD7E4 /* MessageCardMiddlewareTests.swift in Sources */,
E1E425322B5A2E9700899550 /* DownloadTests.swift in Sources */,
5AB4237C28A1947A003BC40C /* MockNotificationCenter.swift in Sources */,
8A37C79F28DA4BA600B1FAD4 /* ContextualHintViewProviderTests.swift in Sources */,
Expand Down Expand Up @@ -18690,6 +18706,7 @@
43DF725E2D197F8000279CAA /* ml */,
4385A43A2D1980CB0003475A /* scn */,
43103E5D2D3E66A300A55043 /* tt */,
432106DF2D47A07900D5FA08 /* lo */,
);
name = KeyboardAccessory.strings;
sourceTree = "<group>";
Expand Down Expand Up @@ -19258,6 +19275,7 @@
43DF725D2D197F8000279CAA /* ml */,
4385A4382D1980CB0003475A /* scn */,
43D85F9B2D22B7D900E4238A /* es-MX */,
432106DE2D47A07900D5FA08 /* lo */,
);
name = FxANotification.strings;
sourceTree = "<group>";
Expand Down Expand Up @@ -19461,6 +19479,7 @@
43944C1D2D22B6C40022CC56 /* co */,
43D85F9E2D22B7D900E4238A /* es-MX */,
43E060402D3E65BD0048F843 /* hr */,
4358D8392D479FA100C8ED24 /* ca */,
);
name = SocialMediaApp.strings;
sourceTree = "<group>";
Expand Down Expand Up @@ -19521,6 +19540,7 @@
43D85F9F2D22B7DA00E4238A /* es-MX */,
4320DD052D352B5E00FC5C5E /* ml */,
43E060412D3E65BD0048F843 /* hr */,
4358D83A2D479FA100C8ED24 /* ca */,
);
name = SocialShare.strings;
sourceTree = "<group>";
Expand Down Expand Up @@ -26584,7 +26604,7 @@
repositoryURL = "https://github.com/mozilla/rust-components-swift.git";
requirement = {
kind = exactVersion;
version = 136.0.20250122050310;
version = 136.0.20250125050306;
};
};
435C85EE2788F4D00072B526 /* XCRemoteSwiftPackageReference "glean-swift" */ = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mozilla/rust-components-swift.git",
"state" : {
"revision" : "420e9474076ce9f60328d357b0ccd15392070c75",
"version" : "136.0.20250122050310"
"revision" : "63d8f97a36e6d483325365a60baaf1e3ce1ad569",
"version" : "136.0.20250125050306"
}
},
{
Expand Down
11 changes: 6 additions & 5 deletions firefox-ios/Client/Coordinators/Browser/BrowserCoordinator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ class BrowserCoordinator: BaseCoordinator,
var webviewController: WebviewViewController?
var legacyHomepageViewController: LegacyHomepageViewController?
var homepageViewController: HomepageViewController?
var privateViewController: PrivateHomepageViewController?
var errorViewController: NativeErrorPageViewController?

private var profile: Profile
Expand Down Expand Up @@ -160,13 +159,15 @@ class BrowserCoordinator: BaseCoordinator,
}

func showPrivateHomepage(overlayManager: OverlayModeManager) {
let privateHomepageController = PrivateHomepageViewController(windowUUID: windowUUID, overlayManager: overlayManager)
let privateHomepageController = PrivateHomepageViewController(
windowUUID: windowUUID,
overlayManager: overlayManager
)
privateHomepageController.parentCoordinator = self
guard browserViewController.embedContent(privateHomepageController) else {
logger.log("Unable to embed private homepage", level: .debug, category: .coordinator)
return
}
self.privateViewController = privateHomepageController
}

func navigateFromHomePanel(to url: URL, visitType: VisitType, isGoogleTopSite: Bool) {
Expand Down Expand Up @@ -387,9 +388,9 @@ class BrowserCoordinator: BaseCoordinator,
case .topSites:
browserViewController.openURLInNewTab(HomePanelType.topSites.internalUrl)
case .newPrivateTab:
browserViewController.openBlankNewTab(focusLocationField: false, isPrivate: true)
browserViewController.openBlankNewTab(focusLocationField: true, isPrivate: true)
case .newTab:
browserViewController.openBlankNewTab(focusLocationField: false)
browserViewController.openBlankNewTab(focusLocationField: true)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ final class HomepageDiffableDataSource:

enum HomeItem: Hashable {
case header(HeaderState)
case messageCard(MessageCardState)
case messageCard(MessageCardConfiguration)
case topSite(TopSiteState, TextColor?)
case topSiteEmpty
case pocket(PocketStoryState)
Expand Down Expand Up @@ -51,9 +51,10 @@ final class HomepageDiffableDataSource:
snapshot.appendSections([.header])
snapshot.appendItems([.header(state.headerState)], toSection: .header)

// TODO: FXIOS-11133 - Handle whether to show / hide message card from message card manager
snapshot.appendSections([.messageCard])
snapshot.appendItems([.messageCard(state.messageState)], toSection: .messageCard)
if let configuration = state.messageState.messageCardConfiguration {
snapshot.appendSections([.messageCard])
snapshot.appendItems([.messageCard(configuration)], toSection: .messageCard)
}

if let topSites = getTopSites(with: state.topSitesState, and: textColor, numberOfCellsPerRow: numberOfCellsPerRow) {
snapshot.appendSections([.topSites(numberOfCellsPerRow)])
Expand Down
Loading

0 comments on commit 6ca0ae3

Please sign in to comment.