diff --git a/build.gradle b/build.gradle index 3b01059900fb..ec114799820b 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ buildscript { // Used in mobile/android/fenix/app/build.gradle classpath ComponentsDependencies.androidx_safeargs - classpath FenixDependencies.osslicenses_plugin + classpath ComponentsDependencies.osslicenses_plugin classpath ComponentsDependencies.tools_benchmarkgradle classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}" classpath "${ApplicationServicesConfig.groupId}:tooling-nimbus-gradle:${ApplicationServicesConfig.version}" 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 index 1071e19cbb58..ae001bc30079 100644 --- a/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt +++ b/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt @@ -98,6 +98,7 @@ object Versions { object Google { const val material = "1.12.0" + const val osslicenses_plugin = "0.10.4" const val play_review = "2.0.1" const val play_services_ads_id = "16.0.0" const val play_services_base = "18.5.0" @@ -243,6 +244,7 @@ object ComponentsDependencies { const val firebase_messaging = "com.google.firebase:firebase-messaging:${Versions.Firebase.messaging}" + const val osslicenses_plugin = "com.google.android.gms:oss-licenses-plugin:${Versions.Google.osslicenses_plugin}" const val play_review = "com.google.android.play:review:${Versions.Google.play_review}" const val play_review_ktx = "com.google.android.play:review-ktx:${Versions.Google.play_review}" const val play_services_ads_id = "com.google.android.gms:play-services-ads-identifier:${Versions.Google.play_services_ads_id}" diff --git a/mobile/android/fenix/build.gradle b/mobile/android/fenix/build.gradle index 99935bc534b1..065b0160257d 100644 --- a/mobile/android/fenix/build.gradle +++ b/mobile/android/fenix/build.gradle @@ -25,7 +25,7 @@ buildscript { classpath ComponentsDependencies.tools_benchmarkgradle classpath ComponentsDependencies.tools_kotlingradle classpath ComponentsDependencies.androidx_safeargs - classpath FenixDependencies.osslicenses_plugin + classpath ComponentsDependencies.osslicenses_plugin classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}" classpath "${ApplicationServicesConfig.groupId}:tooling-nimbus-gradle:${ApplicationServicesConfig.version}" diff --git a/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt index fe374f4e4047..73a9cb7f8767 100644 --- a/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt +++ b/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt @@ -13,8 +13,6 @@ class FenixDependenciesPlugin : Plugin { } object FenixVersions { - const val osslicenses_plugin = "0.10.4" - const val falcon = "2.2.0" const val fastlane = "2.1.1" @@ -36,8 +34,6 @@ object FenixVersions { @Suppress("unused") object FenixDependencies { - const val osslicenses_plugin = "com.google.android.gms:oss-licenses-plugin:${FenixVersions.osslicenses_plugin}" - const val androidx_core_splashscreen = "androidx.core:core-splashscreen:${FenixVersions.androidx_splash_screen}" const val androidx_profileinstaller = "androidx.profileinstaller:profileinstaller:${FenixVersions.androidx_profileinstaller}" const val androidx_viewpager2 = "androidx.viewpager2:viewpager2:${FenixVersions.androidx_viewpager2}" diff --git a/mobile/android/focus-android/build.gradle b/mobile/android/focus-android/build.gradle index af93f6e57bf8..5ee9b0822946 100644 --- a/mobile/android/focus-android/build.gradle +++ b/mobile/android/focus-android/build.gradle @@ -20,7 +20,7 @@ buildscript { dependencies { classpath ComponentsDependencies.tools_androidgradle classpath ComponentsDependencies.tools_kotlingradle - classpath FocusDependencies.osslicenses_plugin + classpath ComponentsDependencies.osslicenses_plugin classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}" classpath "${ApplicationServicesConfig.groupId}:tooling-nimbus-gradle:${ApplicationServicesConfig.version}" diff --git a/mobile/android/focus-android/plugins/focusdependencies/src/main/java/FocusDependenciesPlugin.kt b/mobile/android/focus-android/plugins/focusdependencies/src/main/java/FocusDependenciesPlugin.kt index e299adfb03d9..4f53db976e18 100644 --- a/mobile/android/focus-android/plugins/focusdependencies/src/main/java/FocusDependenciesPlugin.kt +++ b/mobile/android/focus-android/plugins/focusdependencies/src/main/java/FocusDependenciesPlugin.kt @@ -28,10 +28,6 @@ object FocusVersions { const val fastlane = "2.1.1" const val junit = "5.10.2" } - - object ThirdParty { - const val osslicenses_plugin = "0.10.4" - } } object FocusDependencies { @@ -42,7 +38,6 @@ 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 osslicenses_plugin = "com.google.android.gms:oss-licenses-plugin:${FocusVersions.ThirdParty.osslicenses_plugin}" const val falcon = "com.jraska:falcon:${FocusVersions.Testing.falcon}" const val fastlane = "tools.fastlane:screengrab:${FocusVersions.Testing.fastlane}"