diff --git a/app/build.gradle b/app/build.gradle index 56cdf08074..6bf359d283 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -836,3 +836,6 @@ android.applicationVariants.all { variant -> dependsOn "package${variant.name.capitalize()}" } } + +// Enable expiration by major version. +ext.gleanExpireByVersion = Config.majorVersion(project) diff --git a/app/metrics.yaml b/app/metrics.yaml index b450216fe1..654e037f1b 100644 --- a/app/metrics.yaml +++ b/app/metrics.yaml @@ -157,7 +157,7 @@ events: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-12-01" + expires: 108 default_browser_changed: type: event description: | @@ -190,7 +190,7 @@ events: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-08-01" + expires: 104 toolbar_menu_visible: type: event description: | @@ -306,7 +306,7 @@ events: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-12-01" + expires: 108 opened_link: type: event description: | @@ -413,7 +413,7 @@ events: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-12-10" + expires: 108 tab_view_changed: type: event description: | @@ -433,7 +433,7 @@ events: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-05-10" + expires: 101 onboarding: fxa_auto_signin: @@ -624,7 +624,7 @@ search_shortcuts: - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220 notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Search @@ -646,7 +646,7 @@ experiments_default_browser: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-03-31" + expires: 112 toolbar_settings: changed_position: type: event @@ -726,7 +726,7 @@ login_dialog: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Logins @@ -745,7 +745,7 @@ login_dialog: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Logins @@ -764,7 +764,7 @@ login_dialog: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Logins @@ -783,7 +783,7 @@ login_dialog: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Logins @@ -933,7 +933,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Bookmarks @@ -1016,7 +1016,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - PWA @@ -1040,7 +1040,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - PWA @@ -1104,7 +1104,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Settings @@ -1130,7 +1130,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Settings @@ -1156,7 +1156,7 @@ metrics: - technical notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Telemetry @@ -1182,7 +1182,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Telemetry @@ -1208,7 +1208,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Telemetry @@ -1234,7 +1234,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Telemetry @@ -1257,7 +1257,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Toolbar @@ -1280,7 +1280,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Tabs @@ -1303,7 +1303,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Tabs @@ -1326,7 +1326,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Discovery @@ -1378,7 +1378,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Tabs @@ -1459,7 +1459,7 @@ metrics: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 unit: integer customize_home: @@ -1479,7 +1479,7 @@ customize_home: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-20" + expires: 105 jump_back_in: type: boolean description: | @@ -1496,7 +1496,7 @@ customize_home: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-20" + expires: 105 recently_saved: type: boolean description: | @@ -1513,7 +1513,7 @@ customize_home: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-20" + expires: 105 recently_visited: type: boolean description: | @@ -1530,7 +1530,7 @@ customize_home: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-20" + expires: 105 pocket: type: boolean description: | @@ -1546,7 +1546,7 @@ customize_home: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-20" + expires: 105 preference_toggled: type: event description: | @@ -1570,7 +1570,7 @@ customize_home: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-20" + expires: 105 opening_screen: type: string description: | @@ -1586,7 +1586,7 @@ customize_home: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 preferences: studies_enabled: @@ -1604,7 +1604,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 studies_preference_enabled: type: event description: > @@ -1617,7 +1617,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 search_suggestions_enabled: type: boolean description: | @@ -1662,7 +1662,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Settings @@ -1713,7 +1713,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - TrackingProtection @@ -1737,7 +1737,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Settings @@ -1760,7 +1760,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Settings @@ -1783,7 +1783,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Settings @@ -1831,7 +1831,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Sync @@ -1857,7 +1857,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Settings @@ -1880,7 +1880,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Search @@ -2000,7 +2000,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 inactive_tabs_survey_opened: type: event description: > @@ -2015,7 +2015,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 turn_off_inactive_tabs_survey: type: event description: > @@ -2034,7 +2034,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 search_term_groups_enabled: type: boolean description: | @@ -2047,7 +2047,7 @@ preferences: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 search.default_engine: code: @@ -2128,7 +2128,7 @@ search.default_engine: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 bookmarks_management: open: @@ -2144,7 +2144,7 @@ bookmarks_management: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-08-01" + expires: 104 metadata: tags: - Bookmarks @@ -2429,7 +2429,7 @@ custom_tab: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-06-01" + expires: 102 metadata: tags: - CustomTabs @@ -2450,7 +2450,7 @@ custom_tab: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-06-01" + expires: 102 metadata: tags: - CustomTabs @@ -2471,7 +2471,7 @@ custom_tab: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-06-01" + expires: 102 metadata: tags: - CustomTabs @@ -2554,7 +2554,7 @@ error_page: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-12-01" + expires: 108 metadata: tags: - ErrorMessages @@ -2576,7 +2576,7 @@ sync_auth: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Toolbar @@ -2597,7 +2597,7 @@ sync_auth: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Toolbar @@ -2619,7 +2619,7 @@ sync_auth: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Sync @@ -2639,7 +2639,7 @@ sync_auth: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Sync @@ -2727,7 +2727,7 @@ sync_auth: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Accounts @@ -2749,7 +2749,7 @@ sync_auth: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Accounts @@ -2771,7 +2771,7 @@ sync_auth: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Accounts @@ -2791,7 +2791,7 @@ sync_auth: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Sync @@ -2813,7 +2813,7 @@ sync_account: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Toolbar @@ -2834,7 +2834,7 @@ sync_account: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Toolbar @@ -2855,7 +2855,7 @@ sync_account: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - SendTab @@ -2875,7 +2875,7 @@ sync_account: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - SendTab @@ -2897,7 +2897,7 @@ history: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - History @@ -2917,7 +2917,7 @@ history: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - History @@ -2937,7 +2937,7 @@ history: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - History @@ -2957,7 +2957,7 @@ history: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - History @@ -3074,7 +3074,7 @@ history: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 search_term_group_tapped: type: event description: | @@ -3087,7 +3087,7 @@ history: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 search_term_group_open_tab: type: event description: | @@ -3100,7 +3100,7 @@ history: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 search_term_group_remove_tab: type: event description: | @@ -3113,7 +3113,7 @@ history: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 search_term_group_remove_all: type: event description: | @@ -3126,7 +3126,7 @@ history: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 search_icon_tapped: type: event description: | @@ -3139,7 +3139,7 @@ history: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-03-31" + expires: 112 search_result_tapped: type: event description: | @@ -3152,7 +3152,7 @@ history: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-03-31" + expires: 112 recently_closed_tabs: opened: @@ -3167,7 +3167,7 @@ recently_closed_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-01-31" + expires: 109 closed: type: event description: | @@ -3180,7 +3180,7 @@ recently_closed_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-01-31" + expires: 109 show_full_history: type: event description: | @@ -3193,7 +3193,7 @@ recently_closed_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-01-31" + expires: 109 open_tab: type: event description: | @@ -3206,7 +3206,7 @@ recently_closed_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-01-31" + expires: 109 delete_tab: type: event description: | @@ -3219,7 +3219,7 @@ recently_closed_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-01-31" + expires: 109 menu_close: type: event description: | @@ -3232,7 +3232,7 @@ recently_closed_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-01-31" + expires: 109 menu_share: type: event description: | @@ -3245,7 +3245,7 @@ recently_closed_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-01-31" + expires: 109 menu_delete: type: event description: | @@ -3258,7 +3258,7 @@ recently_closed_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-01-31" + expires: 109 menu_open_in_normal_tab: type: event description: | @@ -3271,7 +3271,7 @@ recently_closed_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-01-31" + expires: 109 menu_open_in_private_tab: type: event description: | @@ -3284,7 +3284,7 @@ recently_closed_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-01-31" + expires: 109 enter_multiselect: type: event description: | @@ -3297,7 +3297,7 @@ recently_closed_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-01-31" + expires: 109 exit_multiselect: type: event description: | @@ -3311,7 +3311,7 @@ recently_closed_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-01-31" + expires: 109 reader_mode: available: @@ -3700,7 +3700,7 @@ tabs_tray: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-08-01" + expires: 104 metadata: tags: - Tabs @@ -3717,7 +3717,7 @@ tabs_tray: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-08-01" + expires: 104 metadata: tags: - Tabs @@ -3737,7 +3737,7 @@ tabs_tray: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 close_all_inactive_tabs: type: event description: | @@ -3750,7 +3750,7 @@ tabs_tray: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 auto_close_seen: type: event description: | @@ -3763,7 +3763,7 @@ tabs_tray: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 auto_close_turn_on_clicked: type: event description: | @@ -3776,7 +3776,7 @@ tabs_tray: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 auto_close_dimissed: type: event description: | @@ -3789,7 +3789,7 @@ tabs_tray: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 close_inactive_tab: type: counter description: | @@ -3802,7 +3802,7 @@ tabs_tray: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 open_inactive_tab: type: counter description: | @@ -3815,7 +3815,7 @@ tabs_tray: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 inactive_tabs_cfr_settings: type: event description: | @@ -3828,7 +3828,7 @@ tabs_tray: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 inactive_tabs_cfr_dismissed: type: event description: | @@ -3841,7 +3841,7 @@ tabs_tray: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 inactive_tabs_cfr_visible: type: event description: | @@ -3854,7 +3854,7 @@ tabs_tray: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 collections: renamed: @@ -4189,7 +4189,7 @@ search_widget: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Search @@ -4209,7 +4209,7 @@ search_widget: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Search @@ -4232,7 +4232,7 @@ tracking_protection: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - TrackingProtection @@ -4252,7 +4252,7 @@ tracking_protection: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - TrackingProtection @@ -4272,7 +4272,7 @@ tracking_protection: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - TrackingProtection @@ -4293,7 +4293,7 @@ tracking_protection: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - TrackingProtection @@ -4313,7 +4313,7 @@ tracking_protection: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - TrackingProtection @@ -4339,7 +4339,7 @@ tracking_protection: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: @@ -4361,7 +4361,7 @@ tab: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 no_lint: - COMMON_PREFIX metadata: @@ -4383,7 +4383,7 @@ tab: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Media @@ -4405,7 +4405,7 @@ media_notification: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Media @@ -4425,7 +4425,7 @@ media_notification: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Media @@ -4447,7 +4447,7 @@ media_state: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Media @@ -4467,7 +4467,7 @@ media_state: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Media @@ -4487,7 +4487,7 @@ media_state: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Media @@ -4506,7 +4506,7 @@ media_state: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Media @@ -4525,7 +4525,7 @@ media_state: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Media @@ -4568,7 +4568,7 @@ logins: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Logins @@ -4588,7 +4588,7 @@ logins: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Logins @@ -4608,7 +4608,7 @@ logins: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Logins @@ -4633,7 +4633,7 @@ logins: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Logins @@ -4653,7 +4653,7 @@ logins: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Logins @@ -4673,7 +4673,7 @@ logins: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Logins @@ -4693,7 +4693,7 @@ logins: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Logins @@ -4715,7 +4715,7 @@ voice_search: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Search @@ -4776,7 +4776,7 @@ top_sites: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - Search @@ -4952,7 +4952,7 @@ top_sites: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 baidu_top_site_removed: type: event description: | @@ -4966,7 +4966,7 @@ top_sites: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 open_contile_top_site: type: event description: | @@ -4979,7 +4979,7 @@ top_sites: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 open_contile_in_private_tab: type: event description: | @@ -4993,7 +4993,7 @@ top_sites: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 contile_settings: type: event description: | @@ -5007,7 +5007,7 @@ top_sites: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 contile_sponsors_and_privacy: type: event description: | @@ -5021,7 +5021,7 @@ top_sites: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 app_theme: dark_theme_selected: @@ -5046,7 +5046,7 @@ app_theme: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-12-01" + expires: 108 metadata: tags: @@ -5092,7 +5092,7 @@ pocket: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - PocketIntegration @@ -5109,7 +5109,7 @@ pocket: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-10-01" + expires: 106 home_recs_story_clicked: type: event description: | @@ -5130,7 +5130,7 @@ pocket: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-10-01" + expires: 106 home_recs_category_clicked: type: event description: | @@ -5154,7 +5154,7 @@ pocket: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-10-01" + expires: 106 home_recs_discover_clicked: type: event description: | @@ -5168,7 +5168,7 @@ pocket: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-10-01" + expires: 106 home_recs_learn_more_clicked: type: event description: | @@ -5181,7 +5181,7 @@ pocket: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-10-01" + expires: 106 first_session: campaign: @@ -5406,7 +5406,7 @@ addons: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-08-01" + expires: 104 metadata: tags: - WebExtensions @@ -5431,7 +5431,7 @@ addons: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-08-01" + expires: 104 metadata: tags: - WebExtensions @@ -5452,7 +5452,7 @@ addons: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-08-01" + expires: 104 metadata: tags: - WebExtensions @@ -5547,7 +5547,7 @@ addons: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-08-01" + expires: 104 metadata: tags: @@ -5765,7 +5765,7 @@ perf.awesomebar: notification_emails: - android-probes@mozilla.com - gkruglov@mozilla.com - expires: "2022-11-15" + expires: 107 bookmark_suggestions: send_in_pings: - metrics @@ -5785,7 +5785,7 @@ perf.awesomebar: notification_emails: - android-probes@mozilla.com - gkruglov@mozilla.com - expires: "2022-11-15" + expires: 107 search_engine_suggestions: send_in_pings: - metrics @@ -5805,7 +5805,7 @@ perf.awesomebar: notification_emails: - android-probes@mozilla.com - gkruglov@mozilla.com - expires: "2022-11-15" + expires: 107 session_suggestions: send_in_pings: - metrics @@ -5825,7 +5825,7 @@ perf.awesomebar: notification_emails: - android-probes@mozilla.com - gkruglov@mozilla.com - expires: "2022-11-15" + expires: 107 synced_tabs_suggestions: send_in_pings: - metrics @@ -5845,7 +5845,7 @@ perf.awesomebar: notification_emails: - android-probes@mozilla.com - gkruglov@mozilla.com - expires: "2022-11-15" + expires: 107 clipboard_suggestions: send_in_pings: - metrics @@ -5865,7 +5865,7 @@ perf.awesomebar: notification_emails: - android-probes@mozilla.com - gkruglov@mozilla.com - expires: "2022-11-15" + expires: 107 shortcuts_suggestions: send_in_pings: - metrics @@ -5885,7 +5885,7 @@ perf.awesomebar: notification_emails: - android-probes@mozilla.com - gkruglov@mozilla.com - expires: "2022-11-15" + expires: 107 autoplay: visited_setting: @@ -5902,7 +5902,7 @@ autoplay: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - SitePermissions @@ -5927,7 +5927,7 @@ autoplay: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - SitePermissions @@ -6055,7 +6055,7 @@ progressive_web_app: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-03-31" + expires: 112 metadata: tags: - PWA @@ -6075,7 +6075,7 @@ progressive_web_app: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-03-31" + expires: 112 metadata: tags: - PWA @@ -6208,7 +6208,7 @@ engine_tab: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2022-07-01" + expires: 103 metadata: tags: - Performance @@ -6229,7 +6229,7 @@ engine_tab: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2022-07-01" + expires: 103 metadata: tags: - Performance @@ -6250,7 +6250,7 @@ engine_tab: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2022-07-01" + expires: 103 metadata: tags: - Performance @@ -6270,7 +6270,7 @@ engine_tab: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2022-07-01" + expires: 103 extra_keys: background_active_tabs: description: | @@ -6316,7 +6316,7 @@ synced_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 metadata: tags: - SyncTabs @@ -6459,7 +6459,7 @@ android_autofill: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2023-01-31" + expires: 109 enabled: type: boolean description: | @@ -6475,7 +6475,7 @@ android_autofill: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2023-01-31" + expires: 109 request_matching_logins: type: event description: | @@ -6491,7 +6491,7 @@ android_autofill: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2023-01-31" + expires: 109 request_no_matching_logins: type: event description: | @@ -6507,7 +6507,7 @@ android_autofill: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2023-01-31" + expires: 109 search_displayed: type: event description: | @@ -6523,7 +6523,7 @@ android_autofill: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2023-01-31" + expires: 109 search_item_selected: type: event description: | @@ -6538,7 +6538,7 @@ android_autofill: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2023-01-31" + expires: 109 unlock_cancelled: type: event description: | @@ -6554,7 +6554,7 @@ android_autofill: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2023-01-31" + expires: 109 unlock_successful: type: event description: | @@ -6569,7 +6569,7 @@ android_autofill: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2023-01-31" + expires: 109 confirm_cancelled: type: event description: | @@ -6585,7 +6585,7 @@ android_autofill: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2023-01-31" + expires: 109 confirm_successful: type: event description: | @@ -6600,7 +6600,7 @@ android_autofill: notification_emails: - android-probes@mozilla.com - skaspari@mozilla.com - expires: "2023-01-31" + expires: 109 home_menu: settings_item_clicked: @@ -6617,7 +6617,7 @@ home_menu: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-03-31" + expires: 112 metadata: tags: - Settings @@ -6638,7 +6638,7 @@ home_screen: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-03-31" + expires: 112 metadata: tags: - HomeScreen @@ -6654,7 +6654,7 @@ home_screen: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 customize_home_clicked: type: event description: A user clicked on Customize home from the home screen menu. @@ -6667,7 +6667,7 @@ home_screen: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-20" + expires: 105 start_on_home: enter_home_screen: @@ -6682,7 +6682,7 @@ start_on_home: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-06-16" + expires: 102 metadata: tags: - HomeScreen @@ -6698,7 +6698,7 @@ start_on_home: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-06-16" + expires: 102 metadata: tags: - HomeScreen @@ -6716,7 +6716,7 @@ recent_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-06-23" + expires: 102 metadata: tags: - RecentTabs @@ -6732,7 +6732,7 @@ recent_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-06-23" + expires: 102 metadata: tags: - RecentTabs @@ -6748,7 +6748,7 @@ recent_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-06-23" + expires: 102 metadata: tags: - RecentTabs @@ -6765,7 +6765,7 @@ recent_tabs: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 recent_bookmarks: shown: @@ -6780,7 +6780,7 @@ recent_bookmarks: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 bookmark_clicked: type: counter lifetime: application @@ -6799,7 +6799,7 @@ recent_bookmarks: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 show_all_bookmarks: type: counter lifetime: application @@ -6818,7 +6818,7 @@ recent_bookmarks: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-02-01" + expires: 111 recent_bookmarks_count: type: quantity description: | @@ -6832,7 +6832,7 @@ recent_bookmarks: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 unit: integer recent_searches: @@ -6853,7 +6853,7 @@ recent_searches: - interaction notification_emails: - android-probes@mozilla.com - expires: "2023-03-31" + expires: 112 credit_cards: saved: @@ -6869,7 +6869,7 @@ credit_cards: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-01" + expires: 105 metadata: tags: - Autofill @@ -6886,7 +6886,7 @@ credit_cards: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-01" + expires: 105 metadata: tags: - Autofill @@ -6902,7 +6902,7 @@ credit_cards: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-01" + expires: 105 metadata: tags: - Autofill @@ -6918,7 +6918,7 @@ credit_cards: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-01" + expires: 105 metadata: tags: - Autofill @@ -6934,7 +6934,7 @@ credit_cards: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-01" + expires: 105 metadata: tags: - Autofill @@ -6950,7 +6950,7 @@ credit_cards: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-01" + expires: 105 metadata: tags: - Autofill @@ -6966,7 +6966,7 @@ credit_cards: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-01" + expires: 105 metadata: tags: - Autofill @@ -6982,7 +6982,7 @@ credit_cards: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-01" + expires: 105 metadata: tags: - Autofill @@ -6998,7 +6998,7 @@ credit_cards: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-01" + expires: 105 metadata: tags: - Autofill @@ -7014,7 +7014,7 @@ credit_cards: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-09-01" + expires: 105 metadata: tags: - Autofill @@ -7036,7 +7036,7 @@ search_terms: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 average_tabs_per_group: type: event description: | @@ -7053,7 +7053,7 @@ search_terms: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 jump_back_in_group_tapped: type: event description: | @@ -7066,7 +7066,7 @@ search_terms: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-11-01" + expires: 107 group_size_distribution: type: custom_distribution description: | @@ -7094,7 +7094,7 @@ search_terms: - interaction notification_emails: - android-probes@mozilla.com - expires: "2022-12-01" + expires: 108 wallpapers: wallpaper_settings_opened: @@ -7109,7 +7109,7 @@ wallpapers: - android-probes@mozilla.com data_sensitivity: - interaction - expires: "2023-05-01" + expires: 114 wallpaper_selected: type: event description: | @@ -7129,7 +7129,7 @@ wallpapers: - android-probes@mozilla.com data_sensitivity: - interaction - expires: "2023-05-01" + expires: 114 wallpaper_switched: type: event description: | @@ -7149,7 +7149,7 @@ wallpapers: - android-probes@mozilla.com data_sensitivity: - interaction - expires: "2023-05-01" + expires: 114 change_wallpaper_logo_toggled: type: event description: | @@ -7167,4 +7167,4 @@ wallpapers: - android-probes@mozilla.com data_sensitivity: - interaction - expires: "2023-05-01" + expires: 114 diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index ef27174f30..ed6f95683e 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -42,6 +42,18 @@ object Config { return "$majorVersion.0a1" } + @JvmStatic + fun majorVersion(project: Project): String { + val releaseVersion = releaseVersionName(project) + val version = if (releaseVersion.isBlank()) { + nightlyVersionName() + } else { + releaseVersion + } + + return version.split(".")[0] + } + /** * Generate a build date that follows the ISO-8601 format */