Merge branch 'main' into FNXOSS-40

.cron.yml

@@ -9,23 +9,19 @@ jobs:
           type: decision-task
           treeherder-symbol: nightly-D
           target-tasks-method: nightly
-      when:
-          - {hour: 4, minute: 0}
-          - {hour: 16, minute: 0}
+      when: []
     - name: nightly-test
       job:
           type: decision-task
           treeherder-symbol: Nt
           target-tasks-method: nightly-test
-      when:
-        - {hour: 5, minute: 0}
-        - {hour: 16, minute: 0}
+      when: []
     - name: screenshots
       job:
           type: decision-task
           treeherder-symbol: screenshots-D
           target-tasks-method: screenshots
-      when: [{weekday: 'Monday', hour: 10, minute: 0}]
+      when: [] # unscheduled
     - name: legacy-api-ui-tests
       job:
           type: decision-task

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: We are now using Bugzilla for issue tracking!
+    url: https://bugzilla.mozilla.org/enter_bug.cgi?product=Fenix
+    about: Please file your ticket there, and select the corresponding component from the list. If the component is not in the list, select "General". In commit messages, please reference the ticket using "Bug 1234567 - " as prefix.

.github/workflows/fenix-update-nimbus-experiments.yml

@@ -5,8 +5,6 @@
 name: "Fenix - Update Nimbus Experiments"
 
 on:
-  schedule:
-    - cron: '*/30 * * * *'
   workflow_dispatch: {}
 
 jobs:

.github/workflows/focus-update-nimbus-experiments.yml

@@ -5,8 +5,6 @@
 name: "Focus - Update Nimbus Experiments"
 
 on:
-  schedule:
-    - cron: '*/30 * * * *'
   workflow_dispatch: {}
 
 jobs:

.github/workflows/import-l10n.yml

@@ -18,11 +18,14 @@ jobs:
     name: Import strings
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Main Branch
+      - name: Discover A-C beta version
+        id: discover-beta-version
+        uses: mozilla-mobile/fenix-beta-version@4.2.3
+      - name: Checkout Beta Branch
         uses: actions/checkout@v3
         with:
           path: "source"
-          ref: main
+          ref: releases_v${{ steps.discover-beta-version.outputs.beta_version }}
       - name: Clone android-l10n repository
         uses: actions/checkout@v3
         with:
@@ -74,7 +77,7 @@ jobs:
                 echo "Link: $pr_link"
             else
                 echo "Opening new pull request."
-                gh pr create --fill
+                gh pr create --fill --base releases_v${{ steps.discover-beta-version.outputs.beta_version }}
             fi
           else
             echo "No changes found."

.gitignore

@@ -72,6 +72,7 @@ fastlane/
 .nimbus
 .wallpaper_url
 .pocket_consumer_key
+fenix/app/src/**/res/values/fenix_firebase_push_credentials.xml
 
 # Python Byte-compiled / optimized / DLL files
 __pycache__/

.mergify.yml

@@ -2,6 +2,9 @@ queue_rules:
   - name: default
     conditions:
       - status-success=complete-pr
+      - or:
+        - current-datetime<2024-03-15T00:00:00Z
+        - base!=main
     allow_checks_interruption: false
     priority_rules:
       - name: high priority

CODEOWNERS

@@ -0,0 +1,30 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# This CODEOWNERS file defines individuals or teams that are responsible
+# for code in this repository. Code owners are automatically requested
+# for review when someone opens a pull request that modifies code that
+# they own. Order is important; the last matching pattern takes the most
+# precedence.
+# A CODEOWNERS file uses a pattern that follows the same rules used in
+# gitignore files. The pattern is followed by one or more GitHub usernames
+# or team names using the standard @username or @org/team-name format.
+# You can also refer to a user by an email address that has been added
+# to their GitHub account, for example user@example.com.
+# https://help.github.com/articles/about-codeowners/
+
+# Release Engineering pipeline
+/.cron.yml                      @mozilla-mobile/releng
+/.taskcluster.yml               @mozilla-mobile/releng
+/android-components/automation/ @mozilla-mobile/aet @mozilla-mobile/QA
+/fenix/automation/              @mozilla-mobile/aet @mozilla-mobile/QA
+/focus-android/automation/      @mozilla-mobile/aet @mozilla-mobile/QA
+/taskcluster/                   @mozilla-mobile/releng @mozilla-mobile/aet
+
+# Any android components that may need specific people to be notified
+/android-components/components/feature/accounts-push/             @jonalmeida
+/android-components/components/feature/push/                      @jonalmeida
+
+/android-components/components/lib/push-firebase/                 @jonalmeida
+/android-components/components/lib/state/                         @csadilek @jonalmeida

README.md

@@ -1,6 +1,8 @@
 
 This repository hosts the Firefox for Android (Fenix), Focus on Android, and Mozilla Android Components projects.
 
+⚠️ This repository will soon be migrated to Mozilla Central. See the [announcement here](https://github.com/mozilla-mobile/firefox-android/wiki#upcoming-migration-to-mozilla-central).
+
 # Firefox for Android
 
 [![Task Status](https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-mobile/firefox-android/main/badge.svg)](https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-mobile/firefox-android/main/latest)

android-components/.buildconfig.yml

@@ -269,6 +269,7 @@ projects:
     - ui-autocomplete
     - ui-colors
     - ui-icons
+    - ui-widgets
   compose-awesomebar:
     description: An awesomebar component showing search results matching text entered
       into the toolbar.
@@ -601,7 +602,9 @@ projects:
     path: components/feature/autofill
     publish: true
     upstream_dependencies:
+    - browser-errorpages
     - concept-base
+    - concept-engine
     - concept-fetch
     - concept-storage
     - lib-fetch-okhttp
@@ -756,6 +759,7 @@ projects:
     - ui-colors
     - ui-icons
     - ui-tabcounter
+    - ui-widgets
   feature-downloads:
     description: Feature implementation for apps that want to use Android downloads
       manager.
@@ -818,8 +822,10 @@ projects:
     - feature-session
     - lib-publicsuffixlist
     - lib-state
+    - service-nimbus
     - support-base
     - support-ktx
+    - support-locale
     - support-test
     - support-utils
     - tooling-lint
@@ -1027,6 +1033,7 @@ projects:
     - ui-colors
     - ui-icons
     - ui-tabcounter
+    - ui-widgets
   feature-qr:
     description: A feature that provides functionality for scanning QR codes.
     path: components/feature/qr
@@ -1861,6 +1868,7 @@ projects:
     - ui-colors
     - ui-icons
     - ui-tabcounter
+    - ui-widgets
   service-contile:
     description: A library to communicate with the Contile services API
     path: components/service/contile
@@ -2259,9 +2267,17 @@ projects:
     path: components/ui/widgets
     publish: true
     upstream_dependencies:
+    - browser-errorpages
     - concept-base
+    - concept-engine
+    - concept-fetch
+    - concept-storage
+    - lib-publicsuffixlist
     - support-base
+    - support-ktx
     - support-test
+    - support-test-fakes
+    - support-utils
     - tooling-lint
     - ui-colors
     - ui-icons

android-components/.config.yml

@@ -2,6 +2,7 @@
 componentsGroupId: "org.mozilla.components"
 
 # Synchronized build configuration for all modules
+jvmTargetCompatibility: 17
 compileSdkVersion: 34
 minSdkVersion: 21
-targetSdkVersion: 33
+targetSdkVersion: 34