Bug 1834775 - Pin Gradle plugin versions in their respective Dependencies files

app/build.gradle

@@ -1,17 +1,9 @@
 import org.apache.tools.ant.util.StringUtils
 import org.mozilla.fenix.gradle.tasks.ApkSizeTask
 
-// Variables in plugins {} aren't directly supported. Hack around it by setting an
-// intermediate variable which can pull from FenixDependencies.kt and be used later.
-buildscript {
-    ext {
-        protobuf_plugin_version = FenixVersions.protobuf_plugin
-    }
-}
-
 plugins {
-    id "com.jetbrains.python.envs" version "0.0.26"
-    id "com.google.protobuf" version "$protobuf_plugin_version"
+    id "com.jetbrains.python.envs" version "$python_envs_plugin"
+    id "com.google.protobuf" version "$protobuf_plugin"
 }
 
 apply plugin: 'com.android.application'
@@ -633,9 +625,9 @@ dependencies {
     implementation FenixDependencies.androidx_profileinstaller
 
     androidTestImplementation FenixDependencies.uiautomator
-    androidTestImplementation "tools.fastlane:screengrab:2.0.0"
+    androidTestImplementation FenixDependencies.fastlane
     // This Falcon version is added to maven central now required for Screengrab
-    androidTestImplementation 'com.jraska:falcon:2.2.0'
+    androidTestImplementation FenixDependencies.falcon
 
     androidTestImplementation FenixDependencies.androidx_compose_ui_test
 
@@ -678,7 +670,7 @@ dependencies {
         exclude group: 'org.apache.maven'
     }
 
-    testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3'
+    testImplementation FenixDependencies.maven_ant_tasks
     implementation project(':support-rusthttp')
 
     androidTestImplementation FenixDependencies.mockk_android
@@ -717,7 +709,7 @@ if (project.hasProperty("coverage")) {
     }
 
     jacoco {
-        toolVersion = "0.8.7"
+        toolVersion = FenixVersions.jacoco
     }
 
     android.applicationVariants.all { variant ->

build.gradle

@@ -81,10 +81,18 @@ buildscript {
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
+
+    // Variables in plugins {} aren't directly supported. Hack around it by setting an
+    // intermediate variable which can pull from FenixDependencies.kt and be used later.
+    ext {
+        detekt_plugin = FenixVersions.detekt
+        protobuf_plugin = FenixVersions.protobuf_plugin
+        python_envs_plugin = FenixVersions.python_envs_plugin
+    }
 }
 
 plugins {
-    id("io.gitlab.arturbosch.detekt").version("1.22.0")
+    id("io.gitlab.arturbosch.detekt").version("$detekt_plugin")
 }
 
 allprojects {
@@ -209,7 +217,7 @@ configurations {
 }
 
 dependencies {
-    ktlint("com.pinterest:ktlint:0.48.2") {
+    ktlint("com.pinterest:ktlint:${FenixVersions.ktlint}") {
         attributes {
             attribute(Bundling.BUNDLING_ATTRIBUTE, getObjects().named(Bundling, Bundling.EXTERNAL))
         }

buildSrc/src/main/java/FenixDependencies.kt

@@ -8,6 +8,7 @@
 object FenixVersions {
     const val kotlin = "1.8.21"
     const val coroutines = "1.6.4"
+    const val python_envs_plugin = "0.0.26"
 
     // These versions are linked: lint should be X+23.Y.Z of gradle_plugin version, according to:
     // https://github.com/alexjlockwood/android-lint-checks-demo/blob/0245fc027463137b1b4afb97c5295d60dce998b6/dependencies.gradle#L3
@@ -18,6 +19,12 @@ object FenixVersions {
     const val leakcanary = "2.11"
     const val osslicenses_plugin = "0.10.4"
     const val detekt = "1.22.0"
+    const val ktlint = "0.48.2"
+
+    const val maven_ant_tasks = "2.1.3"
+    const val jacoco = "0.8.7"
+    const val falcon = "2.2.0"
+    const val fastlane = "2.0.0"
 
     const val androidx_activity = "1.7.1"
     const val androidx_compose = "1.4.3"
@@ -128,6 +135,9 @@ object FenixDependencies {
     const val junit = "junit:junit:${FenixVersions.junit}"
     const val mockk = "io.mockk:mockk:${FenixVersions.mockk}"
     const val mockk_android = "io.mockk:mockk-android:${FenixVersions.mockk}"
+    const val maven_ant_tasks = "org.apache.maven:maven-ant-tasks:${FenixVersions.maven_ant_tasks}"
+    const val falcon = "com.jraska:falcon:${FenixVersions.falcon}"
+    const val fastlane = "tools.fastlane:screengrab:${FenixVersions.fastlane}"
 
     // --- START AndroidX test dependencies --- //
     // N.B.: the versions of these dependencies appear to be pinned together. To avoid bugs, they