Issue mozilla-mobile#10070: Only keep one GeckoView component (tracking Nightly)

Author: pocmo

.buildconfig.yml

@@ -191,14 +191,6 @@ projects:
     path: components/browser/engine-gecko
     description: 'Engine implementation based on GeckoView.'
     publish: true
-  browser-engine-gecko-beta:
-    path: components/browser/engine-gecko-beta
-    description: 'Engine implementation based on GeckoView (Beta channel).'
-    publish: true
-  browser-engine-gecko-nightly:
-    path: components/browser/engine-gecko-nightly
-    description: 'Engine implementation based on GeckoView (Nightly).'
-    publish: true
   browser-engine-system:
     path: components/browser/engine-system
     description: 'Engine implementation based on the system WebView.'

build.gradle

@@ -407,7 +407,6 @@ tasks.register("ktlint", JavaExec) {
     args "components/**/*.kt" , "samples/**/*.kt", "!**/build", "buildSrc/**/*.kt"
 }
 
-apply plugin: GVVersionVerifierPlugin
 apply plugin: GitHubPlugin
 
 

buildSrc/src/main/java/Dependencies.kt

@@ -134,21 +134,16 @@ object Dependencies {
     const val tools_detekt_api = "io.gitlab.arturbosch.detekt:detekt-api:${Versions.detekt}"
     const val tools_detekt_test = "io.gitlab.arturbosch.detekt:detekt-test:${Versions.detekt}"
 
+    val mozilla_geckoview = "org.mozilla.geckoview:${Gecko.channel.artifactName}:${Gecko.version}"
     const val mozilla_fxa = "org.mozilla.appservices:fxaclient:${Versions.mozilla_appservices}"
-
     const val mozilla_nimbus = "org.mozilla.appservices:nimbus:${Versions.mozilla_appservices}"
-
     const val mozilla_glean_forUnitTests = "org.mozilla.telemetry:glean-forUnitTests:${Versions.mozilla_glean}"
-
     const val mozilla_sync_autofill = "org.mozilla.appservices:autofill:${Versions.mozilla_appservices}"
     const val mozilla_sync_logins = "org.mozilla.appservices:logins:${Versions.mozilla_appservices}"
     const val mozilla_places = "org.mozilla.appservices:places:${Versions.mozilla_appservices}"
     const val mozilla_sync_manager = "org.mozilla.appservices:syncmanager:${Versions.mozilla_appservices}"
-
     const val mozilla_push = "org.mozilla.appservices:push:${Versions.mozilla_appservices}"
-
     const val mozilla_remote_tabs = "org.mozilla.appservices:tabs:${Versions.mozilla_appservices}"
-
     const val mozilla_httpconfig = "org.mozilla.appservices:httpconfig:${Versions.mozilla_appservices}"
     const val mozilla_full_megazord = "org.mozilla.appservices:full-megazord:${Versions.mozilla_appservices}"
     const val mozilla_full_megazord_forUnitTests = "org.mozilla.appservices:full-megazord-forUnitTests:${Versions.mozilla_appservices}"

buildSrc/src/main/java/GVVersionVerifierPlugin.kt

@@ -2,26 +2,28 @@
  * 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/. */
 
-internal object GeckoVersions {
-    /**
-     * GeckoView Nightly Version.
-     */
-    const val nightly_version = "90.0.20210420095122"
-
+/**
+ * Gecko version and release channel constants used by this version of Android Components.
+ */
+object Gecko {
     /**
-     * GeckoView Beta Version.
+     * GeckoView Version.
      */
-    const val beta_version = "89.0.20210419195043"
+    const val version = "90.0.20210420095122"
 
     /**
-     * GeckoView Release Version.
+     * GeckoView channel
      */
-    const val release_version = "88.0.20210415204500"
+    val channel = GeckoChannel.NIGHTLY
 }
 
-@Suppress("Unused", "MaxLineLength")
-object Gecko {
-    const val geckoview_nightly = "org.mozilla.geckoview:geckoview-nightly:${GeckoVersions.nightly_version}"
-    const val geckoview_beta = "org.mozilla.geckoview:geckoview-beta:${GeckoVersions.beta_version}"
-    const val geckoview_release = "org.mozilla.geckoview:geckoview:${GeckoVersions.release_version}"
+/**
+ * Enum for GeckoView release channels.
+ */
+enum class GeckoChannel(
+    val artifactName: String
+) {
+    NIGHTLY("geckoview-nightly"),
+    BETA("geckoview-beta"),
+    RELEASE("geckoview")
 }