Bug 1918799 - Migrate Falcon & Fastlane to the AC dependencies plugin…

…. r=android-reviewers,mcarare Differential Revision: https://phabricator.services.mozilla.com/D222191
i3roly · Oct 3, 2024 · 72fbbd1 · 72fbbd1
1 parent f11f97c
commit 72fbbd1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 19 deletions.
diff --git a/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt b/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
@@ -109,6 +109,8 @@ object Versions {
         const val androidx_test_orchestrator = "1.5.0"
         const val androidx_test_runner = "1.6.1"
         const val androidx_test_uiautomator = "2.3.0"
+        const val falcon = "2.2.0"
+        const val fastlane = "2.1.1"
         const val junit = "5.11.1"
         const val mockito = "5.14.1"
         const val mockk = "1.13.12"
@@ -128,6 +130,8 @@ object ComponentsDependencies {
     const val junit_vintage = "org.junit.vintage:junit-vintage-engine:${Versions.Testing.junit}"
 
     const val testing_robolectric = "org.robolectric:robolectric:${Versions.robolectric}"
+    const val testing_falcon = "com.jraska:falcon:${Versions.Testing.falcon}"
+    const val testing_fastlane = "tools.fastlane:screengrab:${Versions.Testing.fastlane}"
     const val testing_mockito = "org.mockito:mockito-core:${Versions.Testing.mockito}"
     const val testing_mockk = "io.mockk:mockk:${Versions.Testing.mockk}"
     const val testing_mockk_android = "io.mockk:mockk-android:${Versions.Testing.mockk}"

diff --git a/mobile/android/fenix/app/build.gradle b/mobile/android/fenix/app/build.gradle
@@ -716,9 +716,8 @@ dependencies {
         }
     }
 
-    androidTestImplementation FenixDependencies.fastlane
-    // This Falcon version is added to maven central now required for Screengrab
-    androidTestImplementation FenixDependencies.falcon
+    androidTestImplementation ComponentsDependencies.testing_fastlane
+    androidTestImplementation ComponentsDependencies.testing_falcon
 
     androidTestImplementation(ComponentsDependencies.androidx_espresso_contrib) {
         exclude module: 'protobuf-lite'

diff --git a/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
@@ -13,9 +13,6 @@ class FenixDependenciesPlugin : Plugin<Settings> {
 }
 
 object FenixVersions {
-    const val falcon = "2.2.0"
-    const val fastlane = "2.1.1"
-
     const val adjust = "4.38.2"
     const val installreferrer = "2.2"
 }
@@ -24,9 +21,6 @@ object FenixVersions {
 object FenixDependencies {
     const val adjust = "com.adjust.sdk:adjust-android:${FenixVersions.adjust}"
     const val installreferrer = "com.android.installreferrer:installreferrer:${FenixVersions.installreferrer}"
-
-    const val falcon = "com.jraska:falcon:${FenixVersions.falcon}"
-    const val fastlane = "tools.fastlane:screengrab:${FenixVersions.fastlane}"
 }
 
 /**

diff --git a/mobile/android/focus-android/app/build.gradle b/mobile/android/focus-android/app/build.gradle
@@ -359,8 +359,8 @@ dependencies {
     testImplementation ComponentsDependencies.testing_mockwebserver
     testImplementation project(':lib-fetch-okhttp')
 
-    androidTestImplementation FocusDependencies.fastlane
-    androidTestImplementation FocusDependencies.falcon // Required by fastlane
+    androidTestImplementation ComponentsDependencies.testing_fastlane
+    androidTestImplementation ComponentsDependencies.testing_falcon
 
     constraints {
         implementation (ComponentsDependencies.androidx_tracing) {

diff --git a/.../android/focus-android/plugins/focusdependencies/src/main/java/FocusDependenciesPlugin.kt b/.../android/focus-android/plugins/focusdependencies/src/main/java/FocusDependenciesPlugin.kt
@@ -17,17 +17,9 @@ object FocusVersions {
         const val adjust = "4.38.2"
         const val install_referrer = "2.2"
     }
-
-    object Testing {
-        const val falcon = "2.2.0"
-        const val fastlane = "2.1.1"
-    }
 }
 
 object FocusDependencies {
     const val adjust = "com.adjust.sdk:adjust-android:${FocusVersions.Adjust.adjust}"
     const val install_referrer = "com.android.installreferrer:installreferrer:${FocusVersions.Adjust.install_referrer}"
-
-    const val falcon = "com.jraska:falcon:${FocusVersions.Testing.falcon}"
-    const val fastlane = "tools.fastlane:screengrab:${FocusVersions.Testing.fastlane}"
 }