Bug 1913314 - Migrate the OSS Licenses Gradle Plugin to the AC dependencies plugin. r=android-reviewers,mcarare

Differential Revision: https://phabricator.services.mozilla.com/D220199
This commit is contained in:
Ryan VanderMeulen 2024-08-27 12:40:46 +00:00
Родитель afad8d9aff
Коммит 62f69646a9
6 изменённых файлов: 5 добавлений и 12 удалений

Просмотреть файл

@ -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}"

Просмотреть файл

@ -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}"

Просмотреть файл

@ -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}"

Просмотреть файл

@ -13,8 +13,6 @@ class FenixDependenciesPlugin : Plugin<Settings> {
}
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}"

Просмотреть файл

@ -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}"

Просмотреть файл

@ -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}"