jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Centralize sample dependencies (#77)

Browse Source 
Summary:
The support libraries where out of sync between the projects, causing
the sample build to fail with

```
> Android dependency 'com.android.support:appcompat-v7' has different version for the compile (26.1.0) and runtime (27.1.1) classpath. You should manually set the same version via DependencyResolution
```

This makes sure that the sample submodule uses the top-level
dependencies and same versions.
Closes https://github.com/facebook/Sonar/pull/77

Reviewed By: emilsjolander

Differential Revision: D8447186

Pulled By: passy

fbshipit-source-id: e391501edd97fdbe6456b32cd7305d8be26e20db
This commit is contained in:
Pascal Hartig
2018-06-15 09:24:49 -07:00
committed by Facebook Github Bot
parent 6f95ad512f
commit e820beba83
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
android/sample/build.gradle
View File

@@ -34,28 +34,28 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0' implementation deps.supportAppCompat
implementation 'com.android.support.constraint:constraint-layout:1.1.0' implementation deps.supportConstraintLayout
implementation 'com.android.support:design:26.1.0' implementation deps.supportDesign
testImplementation 'junit:junit:4.12' testImplementation deps.junit
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation deps.supportTestRunner
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation deps.supportEspresso
// Litho // Litho
implementation 'com.facebook.litho:litho-core:0.15.0' implementation deps.lithoCore
implementation 'com.facebook.litho:litho-widget:0.15.0' implementation deps.lithoWidget
compileOnly 'com.facebook.litho:litho-annotations:0.15.0' compileOnly deps.lithoAnnotations
annotationProcessor 'com.facebook.litho:litho-processor:0.15.0' annotationProcessor deps.lithoProcessor
// SoLoader // SoLoader
implementation 'com.facebook.soloader:soloader:0.4.1' implementation deps.soloader
// For integration with Fresco // For integration with Fresco
implementation 'com.facebook.litho:litho-fresco:0.15.0' implementation deps.lithoFresco
// For testing // For testing
testImplementation 'com.facebook.litho:litho-testing:0.15.0' testImplementation deps.lithoTesting
implementation 'com.squareup.okhttp3:okhttp:3.10.0' implementation deps.okhttp3
implementation project(':android') implementation project(':android')
} }

9
build.gradle
View File

@@ -35,7 +35,9 @@ ext.deps = [
supportAppCompat : 'com.android.support:appcompat-v7:27.1.1', supportAppCompat : 'com.android.support:appcompat-v7:27.1.1',
supportCoreUi : 'com.android.support:support-core-ui:27.1.1', supportCoreUi : 'com.android.support:support-core-ui:27.1.1',
supportRecyclerView: 'com.android.support:recyclerview-v7:27.1.1', supportRecyclerView: 'com.android.support:recyclerview-v7:27.1.1',
supportConstraintLayout: 'com.android.support.constraint:constraint-layout:1.1.0',
supportEspresso : 'com.android.support.test.espresso:espresso-core:2.2.2', supportEspresso : 'com.android.support.test.espresso:espresso-core:2.2.2',
supportDesign : 'com.android.support:design:27.1.1',
supportEspressoIntents : 'com.android.support.test.espresso:espresso-intents:2.2.2', supportEspressoIntents : 'com.android.support.test.espresso:espresso-intents:2.2.2',
supportTestRunner : 'com.android.support.test:runner:1.0.2', supportTestRunner : 'com.android.support.test:runner:1.0.2',
// Arch // Arch
@@ -46,12 +48,17 @@ ext.deps = [
// Annotations // Annotations
jsr305 : 'com.google.code.findbugs:jsr305:3.0.1', jsr305 : 'com.google.code.findbugs:jsr305:3.0.1',
inferAnnotations : 'com.facebook.infer.annotation:infer-annotation:0.11.2', inferAnnotations : 'com.facebook.infer.annotation:infer-annotation:0.11.2',
// Litho
lithoAnnotations : 'com.facebook.litho:litho-annotations:0.15.0', lithoAnnotations : 'com.facebook.litho:litho-annotations:0.15.0',
lithoCore : 'com.facebook.litho:litho-core:0.15.0',
lithoWidget : 'com.facebook.litho:litho-widget:0.15.0',
lithoProcessor : 'com.facebook.litho:litho-processor:0.15.0',
lithoFresco : 'com.facebook.litho:litho-fresco:0.15.0',
lithoTesting : 'com.facebook.litho:litho-testing:0.15.0',
// Debugging and testing // Debugging and testing
guava : 'com.google.guava:guava:20.0', guava : 'com.google.guava:guava:20.0',
robolectric : 'org.robolectric:robolectric:3.0', robolectric : 'org.robolectric:robolectric:3.0',
junit : 'junit:junit:4.12', junit : 'junit:junit:4.12',
stetho : 'com.facebook.stetho:stetho:1.5.0', stetho : 'com.facebook.stetho:stetho:1.5.0',
okhttp3 : 'com.squareup.okhttp3:okhttp:3.10.0' okhttp3 : 'com.squareup.okhttp3:okhttp:3.10.0'
] ]