diff --git a/android/build.gradle b/android/build.gradle index f02e4e161..5aa8668ab 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -70,9 +70,6 @@ android { implementation deps.lithoSectionsDebug implementation deps.lithoSectionsCore implementation deps.lithoWidget - implementation deps.fresco - implementation deps.frescoFlipper - implementation deps.frescoStetho compileOnly deps.leakcanary testImplementation deps.mockito diff --git a/android/plugins/fresco/build.gradle b/android/plugins/fresco/build.gradle new file mode 100644 index 000000000..4ec9f23d3 --- /dev/null +++ b/android/plugins/fresco/build.gradle @@ -0,0 +1,27 @@ +/* + * Copyright (c) Facebook, Inc. and its affiliates. + * + * This source code is licensed under the MIT license found in the LICENSE + * file in the root directory of this source tree. + */ + +apply plugin: 'com.android.library' +apply plugin: 'maven' + +android { + compileSdkVersion rootProject.compileSdkVersion + buildToolsVersion rootProject.buildToolsVersion + + defaultConfig { + minSdkVersion rootProject.minSdkVersion + targetSdkVersion rootProject.targetSdkVersion + } + + dependencies { + implementation project(':android') + implementation deps.fresco + implementation deps.frescoFlipper + implementation deps.frescoStetho + compileOnly deps.jsr305 + } +} diff --git a/android/plugins/fresco/src/main/AndroidManifest.xml b/android/plugins/fresco/src/main/AndroidManifest.xml new file mode 100644 index 000000000..ae829b7f1 --- /dev/null +++ b/android/plugins/fresco/src/main/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/android/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperDebugPrefHelper.java b/android/plugins/fresco/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperDebugPrefHelper.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperDebugPrefHelper.java rename to android/plugins/fresco/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperDebugPrefHelper.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperPlugin.java b/android/plugins/fresco/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperPlugin.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperPlugin.java rename to android/plugins/fresco/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperPlugin.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperRequestListener.java b/android/plugins/fresco/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperRequestListener.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperRequestListener.java rename to android/plugins/fresco/src/main/java/com/facebook/flipper/plugins/fresco/FrescoFlipperRequestListener.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/fresco/objecthelper/FlipperObjectHelper.java b/android/plugins/fresco/src/main/java/com/facebook/flipper/plugins/fresco/objecthelper/FlipperObjectHelper.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/fresco/objecthelper/FlipperObjectHelper.java rename to android/plugins/fresco/src/main/java/com/facebook/flipper/plugins/fresco/objecthelper/FlipperObjectHelper.java diff --git a/android/sample/build.gradle b/android/sample/build.gradle index ecc7a7a02..d631abb90 100644 --- a/android/sample/build.gradle +++ b/android/sample/build.gradle @@ -67,5 +67,6 @@ dependencies { testImplementation deps.junit debugImplementation project(':android') + debugImplementation project(':fresco-plugin') releaseImplementation project(':noop') } diff --git a/android/tutorial/build.gradle b/android/tutorial/build.gradle index 5a1678f22..d0171417c 100644 --- a/android/tutorial/build.gradle +++ b/android/tutorial/build.gradle @@ -45,6 +45,7 @@ dependencies { // For simplicity, we use Flipper for both debug and release builds here. // Check out the "sample" app to see how to separate your build flavors. implementation project(':android') + implementation project(':fresco-plugin') implementation deps.soloader // Litho diff --git a/settings.gradle b/settings.gradle index 7b50accd2..e818f6b6e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -29,3 +29,7 @@ project(':libevent').projectDir = file('android/third-party/external/LibEvent/') project(':rsocket').projectDir = file('android/third-party/external/RSocket/') project(':third-party').projectDir = file('android/third-party/') project(':noop').projectDir = file('android/no-op/') + +// Plugins +include ':fresco-plugin' +project(':fresco-plugin').projectDir = file('android/plugins/fresco')