Bug 1954548 - Clean up plugins/dependencies using version catalog r=android-reviewers,RyanVM,jonalmeida

Simple changes in this one, just to unblock some other patches, will clean up in more detail in followup patches

Differential Revision: https://phabricator.services.mozilla.com/D239802

build.gradle

@@ -14,20 +14,12 @@ buildscript {
         }
     }
 
-    ext {
-        detekt_plugin = libs.versions.detekt.get()
-        python_envs_plugin = libs.versions.python.envs.plugin.get()
-
-        // Used in mobile/android/fenix/app/build.gradle
-        protobuf_plugin = libs.versions.protobuf.plugin.get()
-    }
-
     dependencies {
-        classpath 'org.mozilla.apilint:apilint:0.5.3'
+        classpath libs.apilint
         classpath libs.tools.androidgradle
-        classpath 'org.apache.commons:commons-exec:1.3'
+        classpath libs.commons.exec
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
+        classpath libs.spotless
-        classpath 'org.tomlj:tomlj:1.1.0'
+        classpath libs.tomlj
 
         // Used in mobile/android/fenix/app/build.gradle
         classpath libs.androidx.navigation.safeargs

gradle/libs.versions.toml

@@ -94,6 +94,11 @@ robolectric = "4.14.1"
 adjust = "5.1.0"
 sentry = "8.5.0"
 
+apilint = "0.5.3"
+commons-exec = "1.3"
+spotless = "6.25.0"
+tomlj = "1.1.0"
+
 [libraries]
 
 kotlin-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }
@@ -240,9 +245,16 @@ ktlint = { group = "com.pinterest", name = "ktlint", version.ref = "ktlint" }
 # Third party library versions
 adjust = { group = "com.adjust.sdk", name = "adjust-android", version.ref = "adjust" }
 
+apilint = { group = "org.mozilla.apilint", name = "apilint", version.ref = "apilint" }
+commons-exec = { group = "org.apache.commons", name = "commons-exec", version.ref = "commons-exec" }
+spotless = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version.ref = "spotless" }
+tomlj = { group = "org.tomlj", name = "tomlj", version.ref = "tomlj" }
+
 [plugins]
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-dsl = { id = "org.gradle.kotlin.kotlin-dsl", version.ref = "kotlin-dsl" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp-plugin" }
+python-envs-plugin = {id = "com.jetbrains.python.envs", version.ref = "python-envs-plugin"}
+protobuf-plugin = {id = "com.google.protobuf", version.ref = "protobuf-plugin"}

mobile/android/android-components/build.gradle

@@ -22,13 +22,6 @@ buildscript {
     dependencies {
         classpath libs.tools.androidgradle
     }
-
-    // Variables in plugins {} aren't directly supported. Hack around it by setting an
-    // intermediate variable which can pull from DependenciesPlugin.kt and be used later.
-    ext {
-        detekt_plugin = libs.versions.detekt.get()
-        python_envs_plugin = libs.versions.python.envs.plugin.get()
-    }
 }
 
 plugins {

mobile/android/android-components/components/browser/engine-gecko/build.gradle

@@ -21,7 +21,7 @@ buildscript {
 }
 
 plugins {
-    id "com.jetbrains.python.envs" version "$python_envs_plugin"
+    alias(libs.plugins.python.envs.plugin)
 }
 
 apply plugin: 'com.android.library'

mobile/android/android-components/components/feature/fxsuggest/build.gradle

@@ -17,7 +17,7 @@ buildscript {
 }
 
 plugins {
-    id "com.jetbrains.python.envs" version "$python_envs_plugin"
+    alias(libs.plugins.python.envs.plugin)
 }
 
 apply plugin: 'com.android.library'

mobile/android/android-components/components/lib/crash/build.gradle

@@ -21,7 +21,7 @@ buildscript {
 }
 
 plugins {
-    id "com.jetbrains.python.envs" version "$python_envs_plugin"
+    alias(libs.plugins.python.envs.plugin)
 }
 
 apply plugin: 'com.android.library'

mobile/android/android-components/components/service/nimbus/build.gradle

@@ -21,7 +21,7 @@ buildscript {
 }
 
 plugins {
-    id "com.jetbrains.python.envs" version "$python_envs_plugin"
+    alias(libs.plugins.python.envs.plugin)
 }
 
 apply plugin: 'com.android.library'

mobile/android/android-components/samples/glean/build.gradle

@@ -20,7 +20,7 @@ buildscript {
 }
 
 plugins {
-    id "com.jetbrains.python.envs" version "$python_envs_plugin"
+    alias(libs.plugins.python.envs.plugin)
 }
 
 apply plugin: 'com.android.application'

mobile/android/android-components/samples/glean/samples-glean-library/build.gradle

@@ -20,7 +20,7 @@ buildscript {
 }
 
 plugins {
-    id "com.jetbrains.python.envs" version "$python_envs_plugin"
+    alias(libs.plugins.python.envs.plugin)
 }
 
 apply plugin: 'com.android.library'

mobile/android/fenix/app/build.gradle

@@ -21,8 +21,8 @@ buildscript {
 plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
-    id "com.jetbrains.python.envs" version "$python_envs_plugin"
+    alias(libs.plugins.python.envs.plugin)
-    id "com.google.protobuf" version "$protobuf_plugin"
+    alias(libs.plugins.protobuf.plugin)
 }
 
 apply plugin: 'com.android.application'

mobile/android/fenix/build.gradle

@@ -31,14 +31,6 @@ 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 DependenciesPlugin.kt and be used later.
-    ext {
-        detekt_plugin = libs.versions.detekt.get()
-        protobuf_plugin = libs.versions.protobuf.plugin.get()
-        python_envs_plugin = libs.versions.python.envs.plugin.get()
-    }
 }
 
 plugins {

mobile/android/focus-android/app/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
-    id "com.jetbrains.python.envs" version "$python_envs_plugin"
+    alias(libs.plugins.python.envs.plugin)
 }
 
 apply plugin: 'com.android.application'

mobile/android/focus-android/build.gradle

@@ -26,13 +26,6 @@ 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 DependenciesPlugin.kt and be used later.
-    ext {
-        detekt_plugin = libs.versions.detekt.get()
-        python_envs_plugin = libs.versions.python.envs.plugin.get()
-    }
 }
 
 plugins {