Bug 1949260 - Part 1 - Replace FenixDependenciesPlugin with gradle ve…

…rsion catalog r=android-reviewers,nalexander,jonalmeida

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

build/sparse-profiles/taskgraph

@@ -106,5 +106,4 @@ path:mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties
 path:mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties
 path:mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
 path:mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
-path:mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
 path:mobile/android/version.txt

gradle/libs.versions.toml

@@ -0,0 +1,7 @@
+[versions]
+adjust = "4.38.2"
+installreferrer = "2.2"
+
+[libraries]
+adjust = { group = "com.adjust.sdk", name = "adjust-android", version.ref = "adjust" }
+installreferrer = { group = "com.android.installreferrer", name = "installreferrer", version.ref = "installreferrer" }

mobile/android/android-components/build.gradle

@@ -25,7 +25,7 @@ buildscript {
     }
 
     // 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.
+    // intermediate variable which can pull from DependenciesPlugin.kt and be used later.
     ext {
         detekt_plugin = Versions.detekt
         python_envs_plugin = Versions.python_envs_plugin
@@ -63,8 +63,9 @@ subprojects {
         kotlinOptions.allWarningsAsErrors = true
     }
 
-    // Prevent some dependencies from being used in AC.
+    // Prevent some dependencies used by Fenix/Focus from being used in AC.
     project.configurations.all {
+        exclude group: 'com.adjust.sdk', module: 'adjust-android'
         exclude group: 'io.mockk', module: 'mockk'
     }
 

mobile/android/fenix/app/build.gradle

@@ -708,8 +708,8 @@ dependencies {
     implementation ComponentsDependencies.protobuf_javalite
     implementation ComponentsDependencies.google_material
 
-    implementation FenixDependencies.adjust
-    implementation FenixDependencies.installreferrer // Required by Adjust
+    implementation(libs.adjust)
+    implementation(libs.installreferrer)
 
     // Required for the Google Advertising ID
     implementation ComponentsDependencies.play_services_ads_id

mobile/android/fenix/build.gradle

@@ -34,7 +34,7 @@ buildscript {
     }
 
     // Variables in plugins {} aren't directly supported. Hack around it by setting an
-    // intermediate variable which can pull from FenixDependenciesPlugin.kt and be used later.
+    // intermediate variable which can pull from DependenciesPlugin.kt and be used later.
     ext {
         detekt_plugin = Versions.detekt
         ksp_plugin = Versions.ksp_plugin

mobile/android/fenix/settings.gradle

@@ -24,16 +24,22 @@ pluginManagement {
     includeBuild("../android-components/plugins/dependencies")
     includeBuild("../android-components/plugins/config")
     includeBuild("./plugins/apksize")
-    includeBuild("./plugins/fenixdependencies")
 }
 
 plugins {
     id 'ApkSizePlugin'
-    id 'FenixDependenciesPlugin'
     id "mozac.ConfigPlugin"
     id 'mozac.DependenciesPlugin'
 }
 
+dependencyResolutionManagement {
+    versionCatalogs {
+        libs {
+            from(files("../../../gradle/libs.versions.toml"))
+        }
+    }
+}
+
 ext.topsrcdir = rootProject.projectDir.absolutePath.minus("mobile/android/fenix")
 
 apply from: file('../shared-settings.gradle')

settings.gradle

@@ -23,14 +23,12 @@ pluginManagement {
     includeBuild("${rootProject.projectDir.absolutePath}/mobile/android/android-components/plugins/dependencies")
     includeBuild("${rootProject.projectDir.absolutePath}/mobile/android/android-components/plugins/publicsuffixlist")
     includeBuild("${rootProject.projectDir.absolutePath}/mobile/android/fenix/plugins/apksize")
-    includeBuild("${rootProject.projectDir.absolutePath}/mobile/android/fenix/plugins/fenixdependencies")
 }
 
 plugins {
     id "mozac.ConfigPlugin"
     id 'mozac.DependenciesPlugin'
     id 'ApkSizePlugin'
-    id 'FenixDependenciesPlugin'
 }
 
 // You might think topsrcdir is '.', but that's not true when the Gradle build

taskcluster/kinds/toolchain/android.yml

@@ -239,7 +239,6 @@ linux64-android-gradle-dependencies:
             - 'mobile/android/gradle.configure'
             - 'mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt'
             - 'mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt'
-            - 'mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt'
         toolchain-artifact: public/build/android-gradle-dependencies.tar.zst
         toolchain-alias: android-gradle-dependencies
     fetches: