Skip to content
This repository has been archived by the owner on Jan 12, 2023. It is now read-only.

Commit

Permalink
For #8035 - Refactor Dependencies to FocusDependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@gabrielluong @mergify
gabrielluong authored and mergify[bot] committed Nov 16, 2022
1 parent 18c217e commit 162e002
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 64 deletions.
118 changes: 59 additions & 59 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,34 +210,34 @@ configurations {
}

dependencies {
implementation Dependencies.androidx_appcompat
implementation Dependencies.androidx_browser
implementation Dependencies.androidx_cardview
implementation Dependencies.androidx_compose_ui
implementation Dependencies.androidx_compose_ui_tooling
implementation Dependencies.androidx_compose_foundation
implementation Dependencies.androidx_compose_material
implementation Dependencies.androidx_compose_runtime_livedata
implementation Dependencies.androidx_constraint_layout
implementation Dependencies.androidx_constraint_layout_compose
implementation Dependencies.androidx_core_ktx
implementation Dependencies.androidx_fragment
implementation Dependencies.androidx_lifecycle_process
implementation Dependencies.androidx_lifecycle_viewmodel
implementation Dependencies.androidx_palette
implementation Dependencies.androidx_preference
implementation Dependencies.androidx_recyclerview
implementation Dependencies.androidx_savedstate
implementation Dependencies.androidx_splashscreen
implementation Dependencies.androidx_transition
implementation Dependencies.androidx_work_ktx

implementation Dependencies.google_accompanist_insets_ui
implementation Dependencies.google_play

implementation Dependencies.google_material

implementation Dependencies.sentry
implementation FocusDependencies.androidx_appcompat
implementation FocusDependencies.androidx_browser
implementation FocusDependencies.androidx_cardview
implementation FocusDependencies.androidx_compose_ui
implementation FocusDependencies.androidx_compose_ui_tooling
implementation FocusDependencies.androidx_compose_foundation
implementation FocusDependencies.androidx_compose_material
implementation FocusDependencies.androidx_compose_runtime_livedata
implementation FocusDependencies.androidx_constraint_layout
implementation FocusDependencies.androidx_constraint_layout_compose
implementation FocusDependencies.androidx_core_ktx
implementation FocusDependencies.androidx_fragment
implementation FocusDependencies.androidx_lifecycle_process
implementation FocusDependencies.androidx_lifecycle_viewmodel
implementation FocusDependencies.androidx_palette
implementation FocusDependencies.androidx_preference
implementation FocusDependencies.androidx_recyclerview
implementation FocusDependencies.androidx_savedstate
implementation FocusDependencies.androidx_splashscreen
implementation FocusDependencies.androidx_transition
implementation FocusDependencies.androidx_work_ktx

implementation FocusDependencies.google_accompanist_insets_ui
implementation FocusDependencies.google_play

implementation FocusDependencies.google_material

implementation FocusDependencies.sentry

implementation "org.mozilla.components:browser-engine-gecko:${AndroidComponents.VERSION}"
implementation "org.mozilla.components:browser-domains:${AndroidComponents.VERSION}"
Expand Down Expand Up @@ -297,59 +297,59 @@ dependencies {

implementation project(':service-telemetry')

implementation Dependencies.kotlin_coroutines
debugImplementation Dependencies.leakcanary
implementation FocusDependencies.kotlin_coroutines
debugImplementation FocusDependencies.leakcanary

focusImplementation Dependencies.adjust
focusImplementation Dependencies.install_referrer // Required by Adjust
focusImplementation FocusDependencies.adjust
focusImplementation FocusDependencies.install_referrer // Required by Adjust

jnaForTest Dependencies.jna
jnaForTest FocusDependencies.jna
testImplementation files(configurations.jnaForTest.copyRecursive().files)
testImplementation "org.mozilla.telemetry:glean-native-forUnitTests:${project.ext.glean_version}"

testImplementation Dependencies.testing_junit_api
testRuntimeOnly Dependencies.testing_junit_engine
testImplementation Dependencies.testing_junit_params
testImplementation Dependencies.testing_robolectric
testImplementation Dependencies.testing_mockito
testImplementation Dependencies.testing_coroutines
testImplementation Dependencies.androidx_work_testing
testImplementation Dependencies.androidx_arch_core_testing
testImplementation FocusDependencies.testing_junit_api
testRuntimeOnly FocusDependencies.testing_junit_engine
testImplementation FocusDependencies.testing_junit_params
testImplementation FocusDependencies.testing_robolectric
testImplementation FocusDependencies.testing_mockito
testImplementation FocusDependencies.testing_coroutines
testImplementation FocusDependencies.androidx_work_testing
testImplementation FocusDependencies.androidx_arch_core_testing
testImplementation "org.mozilla.components:support-test:${AndroidComponents.VERSION}"
testImplementation "org.mozilla.components:support-test-libstate:${AndroidComponents.VERSION}"
androidTestImplementation Dependencies.espresso_core, {
androidTestImplementation FocusDependencies.espresso_core, {
exclude group: 'com.android.support', module: 'support-annotations'
}
androidTestImplementation Dependencies.espresso_idling_resource
androidTestImplementation Dependencies.espresso_web, {
androidTestImplementation FocusDependencies.espresso_idling_resource
androidTestImplementation FocusDependencies.espresso_web, {
exclude group: 'com.android.support', module: 'support-annotations'
}
androidTestImplementation Dependencies.espresso_intents
androidTestImplementation FocusDependencies.espresso_intents

androidTestImplementation Dependencies.testing_mockwebserver
testImplementation Dependencies.testing_mockwebserver
androidTestImplementation FocusDependencies.testing_mockwebserver
testImplementation FocusDependencies.testing_mockwebserver
testImplementation "org.mozilla.components:lib-fetch-okhttp:${AndroidComponents.VERSION}"

androidTestImplementation Dependencies.fastlane
implementation Dependencies.falcon // Required by fastlane
androidTestImplementation FocusDependencies.fastlane
implementation FocusDependencies.falcon // Required by fastlane

androidTestImplementation Dependencies.espresso_contrib, {
androidTestImplementation FocusDependencies.espresso_contrib, {
exclude module: 'appcompat-v7'
exclude module: 'support-v4'
exclude module: 'support-annotations'
exclude module: 'recyclerview-v7'
exclude module: 'design'
exclude module: 'espresso-core'
}
testImplementation Dependencies.androidx_test_core
testImplementation Dependencies.androidx_test_runner
testImplementation Dependencies.androidx_test_rules

androidTestImplementation Dependencies.androidx_test_core_ktx
androidTestImplementation Dependencies.androidx_junit_ktx
androidTestImplementation Dependencies.androidx_uiautomator
androidTestImplementation Dependencies.androidx_test_runner
androidTestUtil Dependencies.androidx_orchestrator
testImplementation FocusDependencies.androidx_test_core
testImplementation FocusDependencies.androidx_test_runner
testImplementation FocusDependencies.androidx_test_rules

androidTestImplementation FocusDependencies.androidx_test_core_ktx
androidTestImplementation FocusDependencies.androidx_junit_ktx
androidTestImplementation FocusDependencies.androidx_uiautomator
androidTestImplementation FocusDependencies.androidx_test_runner
androidTestUtil FocusDependencies.androidx_orchestrator

}
// -------------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ buildscript {
}

dependencies {
classpath Dependencies.android_gradle_plugin
classpath Dependencies.kotlin_gradle_plugin
classpath FocusDependencies.android_gradle_plugin
classpath FocusDependencies.kotlin_gradle_plugin
classpath "org.mozilla.components:tooling-glean-gradle:${AndroidComponents.VERSION}"
classpath "org.mozilla.components:tooling-nimbus-gradle:${AndroidComponents.VERSION}"

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Dependencies.kt → buildSrc/src/main/java/FocusDependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ object Versions {
const val ktlint_version = Versions.Testing.ktlint
}

object Dependencies {
object FocusDependencies {
const val androidx_annotation = "androidx.annotation:annotation:${Versions.AndroidX.annotation}"
const val androidx_arch_core_testing = "androidx.arch.core:core-testing:${Versions.AndroidX.arch}"
const val androidx_appcompat = "androidx.appcompat:appcompat:${Versions.AndroidX.appcompat}"
Expand Down
4 changes: 2 additions & 2 deletions service-telemetry/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ dependencies {
implementation "org.mozilla.components:support-base:${AndroidComponents.VERSION}"
implementation "org.mozilla.components:concept-fetch:${AndroidComponents.VERSION}"

implementation Dependencies.androidx_annotation
}
implementation FocusDependencies.androidx_annotation
}

0 comments on commit 162e002

Please sign in to comment.