Revert "Update sources from Firefox. (#2)"

This reverts commit c4d2c1d.

.cron.yml

@@ -11,6 +11,14 @@ jobs:
           target-tasks-method: nightly
       when:
           - {hour: 5, minute: 0}
+    # This is a temporary hook in order to not overload Google Play.
+    # See bug 1628413 for more context.
+    - name: nightly-on-google-play
+      job:
+          type: decision-task
+          treeherder-symbol: Nd-gp
+          target-tasks-method: nightly-on-google-play
+      when:
           - {hour: 17, minute: 0}
     - name: fennec-production
       job:

.github/workflows/build-contributor-pr.yml

@@ -107,7 +107,7 @@ jobs:
 
   run-ui:
     runs-on: macos-11
-    if: ${{ false }} # disable for now'
+    if: github.event.pull_request.head.repo.full_name != github.repository && github.actor != 'MickeyMoz'
 
     timeout-minutes: 60
     strategy:

README.md

@@ -1,6 +1,6 @@
 # Firefox for Android
 
-[![Task Status](https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-mobile/fenix/main/badge.svg)](https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-mobile/fenix/main/latest)
+[![Task Status](https://github.taskcluster.net/v1/repository/mozilla-mobile/fenix/main/badge.svg)](https://github.taskcluster.net/v1/repository/mozilla-mobile/fenix/main/latest)
 [![codecov](https://codecov.io/gh/mozilla-mobile/fenix/branch/main/graph/badge.svg)](https://codecov.io/gh/mozilla-mobile/fenix)
 
 Fenix (internal codename) is the all-new Firefox for Android browser, based on [GeckoView](https://mozilla.github.io/geckoview/) and [Mozilla Android Components](https://mozac.org/).
@@ -153,7 +153,7 @@ git push <remote> --no-verify
 
 Note: If while pushing you encounter this error "Could not initialize class org.codehaus.groovy.runtime.InvokerHelper" and are currently on Java14 then downgrading your Java version to Java13 or lower can resolve the issue
 
-Steps to downgrade Java Version on Mac with Brew:
+Steps to downgrade Java Version on Mac with Brew: 
 1. Install Homebrew (https://brew.sh/)
 2. run ```brew update```
 3. To uninstall your current java version, run ```sudo rm -fr /Library/Java/JavaVirtualMachines/<jdk-version>```

app/build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'jacoco'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'com.google.android.gms.oss-licenses-plugin'
@@ -259,6 +259,7 @@ android {
             // reserve more memory and also create a new process after every 80 test classes. This
             // is a band-aid solution and eventually we should try to find and fix the leaks
             // instead. :)
+            maxParallelForks = 2
             forkEvery = 80
             maxHeapSize = "3072m"
             minHeapSize = "1024m"
@@ -274,19 +275,19 @@ android {
     }
 }
 
+android.applicationVariants.all { variant ->
+
 // -------------------------------------------------------------------------------------------------
 // Set up kotlin-allopen plugin for writing tests
 // -------------------------------------------------------------------------------------------------
 
-boolean hasTest = gradle.startParameter.taskNames.find { it.contains("test") || it.contains("Test") } != null
-if (hasTest) {
-    apply plugin: 'kotlin-allopen'
-    allOpen {
-        annotation("org.mozilla.fenix.utils.OpenClass")
+    boolean hasTest = gradle.startParameter.taskNames.find { it.contains("test") || it.contains("Test") } != null
+    if (hasTest) {
+        apply plugin: 'kotlin-allopen'
+        allOpen {
+            annotation("org.mozilla.fenix.utils.OpenClass")
+        }
     }
-}
-
-android.applicationVariants.all { variant ->
 
 // -------------------------------------------------------------------------------------------------
 // Generate version codes for builds
@@ -312,15 +313,12 @@ android.applicationVariants.all { variant ->
         println("versionName override: $versionName")
 
         variant.outputs.each { output ->
-            def isMozillaOnline = project.hasProperty("mozillaOnline") || gradle.hasProperty("localProperties.mozillaOnline")
             def abi = output.getFilter(OutputFile.ABI)
-            // If it is a Mozilla Online build, use a unified version code of armeabi-v7a
-            def arch = (isMozillaOnline) ? "armeabi-v7a" : abi
             // We use the same version code generator, that we inherited from Fennec, across all channels - even on
             // channels that never shipped a Fennec build.
-            def versionCodeOverride = Config.generateFennecVersionCode(arch)
+            def versionCodeOverride = Config.generateFennecVersionCode(abi)
 
-            println("versionCode for $abi = $versionCodeOverride, isMozillaOnline = $isMozillaOnline")
+            println("versionCode for $abi = $versionCodeOverride")
 
             output.versionNameOverride = versionName
             output.versionCodeOverride = versionCodeOverride
@@ -428,6 +426,10 @@ android.applicationVariants.all { variant ->
     }
 }
 
+androidExtensions {
+    experimental = true
+}
+
 // Generate Kotlin code for the Fenix Glean metrics.
 apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"
 
@@ -521,7 +523,6 @@ dependencies {
     implementation Deps.mozilla_feature_webcompat
     implementation Deps.mozilla_feature_webnotifications
     implementation Deps.mozilla_feature_webcompat_reporter
-    implementation Deps.mozilla_service_pocket
 
     implementation Deps.mozilla_service_digitalassetlinks
     implementation Deps.mozilla_service_sync_autofill
@@ -564,9 +565,7 @@ dependencies {
     implementation Deps.androidx_navigation_fragment
     implementation Deps.androidx_navigation_ui
     implementation Deps.androidx_recyclerview
-    implementation Deps.androidx_lifecycle_common
     implementation Deps.androidx_lifecycle_livedata
-    implementation Deps.androidx_lifecycle_process
     implementation Deps.androidx_lifecycle_runtime
     implementation Deps.androidx_lifecycle_viewmodel
     implementation Deps.androidx_core