From fbe9e3a08609344bc0cfc454c929789d2630c0ad Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Mon, 4 Mar 2019 09:00:23 -0800 Subject: [PATCH] Prepare for Fresco stable release (#385) Summary: This unblocks our open source releases. Pull Request resolved: https://github.com/facebook/flipper/pull/385 Reviewed By: danielbuechele Differential Revision: D14299867 Pulled By: passy fbshipit-source-id: d9ce29d0d0713cd54f6d8bed03e7a919f443f44b --- android/build.gradle | 7 +++---- android/sample/build.gradle | 11 ++--------- build.gradle | 5 +++-- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f9b363ee0..a763ede15 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -53,10 +53,9 @@ android { implementation deps.lithoSectionsDebug implementation deps.lithoWidget implementation deps.rhino - // TODO(T40752310): Should be depending on a stable version. - compileOnly('com.github.facebook:fresco:0ff379c262') { - exclude group: 'com.squareup.okhttp3' - } + implementation deps.fresco + implementation deps.frescoFlipper + implementation deps.frescoStetho compileOnly deps.leakcanary testImplementation deps.mockito diff --git a/android/sample/build.gradle b/android/sample/build.gradle index c9302b3bc..21d6306ba 100644 --- a/android/sample/build.gradle +++ b/android/sample/build.gradle @@ -30,20 +30,13 @@ dependencies { implementation deps.lithoWidget implementation deps.lithoAnnotations // TODO(T40752310): Temporary while we depend on the jitpack artifact with a different group. - implementation(deps.lithoFresco) { - exclude group: 'com.facebook.fresco' - } + implementation deps.lithoFresco annotationProcessor deps.lithoProcessor // Third-party implementation deps.soloader implementation deps.okhttp3 - // TODO(T40752310): Temporary till Fresco has a stable release. - implementation('com.github.facebook:fresco:0ff379c262') { - exclude group: 'com.squareup.okhttp3' - exclude group: 'com.github.facebook.fresco', module: 'animated-base-test' - exclude group: 'com.github.facebook.fresco', module: 'imagepipeline-test' - } + implementation deps.fresco // Integration test androidTestImplementation deps.testCore diff --git a/build.gradle b/build.gradle index db17294fc..e8c54b791 100644 --- a/build.gradle +++ b/build.gradle @@ -27,8 +27,6 @@ subprojects { if (isSnapshot()) { maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } - // TODO(T40752310): Remove this once Fresco is stable. - maven { url 'https://jitpack.io' } } } } @@ -82,4 +80,7 @@ ext.deps = [ testRules : 'androidx.test:rules:1.1.0', // Plugin dependencies rhino : 'org.mozilla:rhino:1.7.10', + frescoFlipper : 'com.facebook.fresco:flipper:1.13.0', + frescoStetho : 'com.facebook.fresco:stetho:1.13.0', + fresco : 'com.facebook.fresco:fresco:1.13.0' ]